Merged to 4.0 in r296152.
On Thu, Feb 23, 2017 at 5:16 PM, Hans Wennborg via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: hans > Date: Thu Feb 23 19:16:34 2017 > New Revision: 296063 > > URL: http://llvm.org/viewvc/llvm-project?rev=296063&view=rev > Log: > Revert r291477 "[Frontend] Correct values of ATOMIC_*_LOCK_FREE to match > builtin" > > It caused PR31864. There is a patch in progress to fix that, but let's > revert in the meantime. > > Modified: > cfe/trunk/lib/Frontend/InitPreprocessor.cpp > cfe/trunk/test/Sema/atomic-ops.c > > Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=296063&r1=296062&r2=296063&view=diff > ============================================================================== > --- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original) > +++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Thu Feb 23 19:16:34 2017 > @@ -286,12 +286,12 @@ static void DefineFastIntType(unsigned T > > /// Get the value the ATOMIC_*_LOCK_FREE macro should have for a type with > /// the specified properties. > -static const char *getLockFreeValue(unsigned TypeWidth, unsigned > InlineWidth) { > +static const char *getLockFreeValue(unsigned TypeWidth, unsigned TypeAlign, > + unsigned InlineWidth) { > // Fully-aligned, power-of-2 sizes no larger than the inline > // width will be inlined as lock-free operations. > - // Note: we do not need to check alignment since _Atomic(T) is always > - // appropriately-aligned in clang. > - if ((TypeWidth & (TypeWidth - 1)) == 0 && TypeWidth <= InlineWidth) > + if (TypeWidth == TypeAlign && (TypeWidth & (TypeWidth - 1)) == 0 && > + TypeWidth <= InlineWidth) > return "2"; // "always lock free" > // We cannot be certain what operations the lib calls might be > // able to implement as lock-free on future processors. > @@ -886,6 +886,7 @@ static void InitializePredefinedMacros(c > #define DEFINE_LOCK_FREE_MACRO(TYPE, Type) \ > Builder.defineMacro("__GCC_ATOMIC_" #TYPE "_LOCK_FREE", \ > getLockFreeValue(TI.get##Type##Width(), \ > + TI.get##Type##Align(), \ > InlineWidthBits)); > DEFINE_LOCK_FREE_MACRO(BOOL, Bool); > DEFINE_LOCK_FREE_MACRO(CHAR, Char); > @@ -898,6 +899,7 @@ static void InitializePredefinedMacros(c > DEFINE_LOCK_FREE_MACRO(LLONG, LongLong); > Builder.defineMacro("__GCC_ATOMIC_POINTER_LOCK_FREE", > getLockFreeValue(TI.getPointerWidth(0), > + TI.getPointerAlign(0), > InlineWidthBits)); > #undef DEFINE_LOCK_FREE_MACRO > } > > Modified: cfe/trunk/test/Sema/atomic-ops.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/atomic-ops.c?rev=296063&r1=296062&r2=296063&view=diff > ============================================================================== > --- cfe/trunk/test/Sema/atomic-ops.c (original) > +++ cfe/trunk/test/Sema/atomic-ops.c Thu Feb 23 19:16:34 2017 > @@ -14,7 +14,11 @@ _Static_assert(__GCC_ATOMIC_WCHAR_T_LOCK > _Static_assert(__GCC_ATOMIC_SHORT_LOCK_FREE == 2, ""); > _Static_assert(__GCC_ATOMIC_INT_LOCK_FREE == 2, ""); > _Static_assert(__GCC_ATOMIC_LONG_LOCK_FREE == 2, ""); > +#ifdef __i386__ > +_Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 1, ""); > +#else > _Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 2, ""); > +#endif > _Static_assert(__GCC_ATOMIC_POINTER_LOCK_FREE == 2, ""); > > _Static_assert(__c11_atomic_is_lock_free(1), ""); > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
