Author: hans Date: Tue Jan 31 10:40:22 2017 New Revision: 293645 URL: http://llvm.org/viewvc/llvm-project?rev=293645&view=rev Log: Merging r293581: ------------------------------------------------------------------------ r293581 | bogner | 2017-01-30 17:26:09 -0800 (Mon, 30 Jan 2017) | 12 lines
Revert "Adorn __call_once_proxy with `inline` and `_LIBCPP_INLINE_VISIBILITY`" While this change didn't really hurt, it does lead to spurious warnings about not being able to override weak symbols if you end up linking objects built with this change to ones built without it. Furthermore, since __call_once_proxy is called indirectly anyway it doesn't actually inline ever. Longer term, it would probably make sense to give this symbol internal visibility instead. This reverts r291497 ------------------------------------------------------------------------ Modified: libcxx/branches/release_40/ (props changed) libcxx/branches/release_40/include/mutex Propchange: libcxx/branches/release_40/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 31 10:40:22 2017 @@ -1,2 +1,2 @@ /libcxx/branches/apple:136569-137939 -/libcxx/trunk:292013,292091,292607,292990,293154,293197 +/libcxx/trunk:292013,292091,292607,292990,293154,293197,293581 Modified: libcxx/branches/release_40/include/mutex URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/include/mutex?rev=293645&r1=293644&r2=293645&view=diff ============================================================================== --- libcxx/branches/release_40/include/mutex (original) +++ libcxx/branches/release_40/include/mutex Tue Jan 31 10:40:22 2017 @@ -559,7 +559,6 @@ public: #endif template <class _Fp> -inline _LIBCPP_INLINE_VISIBILITY void __call_once_proxy(void* __vp) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits