[llvm-branch-commits] [cfe-branch] r296150 - Revert r296139; it accidentally merged multiple things
Hans Wennborg via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Feb 24 10:42:59 PST 2017
Author: hans
Date: Fri Feb 24 12:42:59 2017
New Revision: 296150
URL: http://llvm.org/viewvc/llvm-project?rev=296150&view=rev
Log:
Revert r296139; it accidentally merged multiple things
Modified:
cfe/branches/release_40/ (props changed)
cfe/branches/release_40/lib/CodeGen/CGOpenMPRuntime.cpp
cfe/branches/release_40/lib/Frontend/InitPreprocessor.cpp
cfe/branches/release_40/test/OpenMP/cancellation_point_codegen.cpp
cfe/branches/release_40/test/Sema/atomic-ops.c
Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 12:42:59 2017
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293678,293787,294008,294800,294855,294954,295149-295150,295224,295313,295473-295474,295592,295610,295843
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293678,293787,294008,294800,294855,294954,295149-295150,295224,295313,295473,295592,295610,295843
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_40/lib/CodeGen/CGOpenMPRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/CodeGen/CGOpenMPRuntime.cpp?rev=296150&r1=296149&r2=296150&view=diff
==============================================================================
--- cfe/branches/release_40/lib/CodeGen/CGOpenMPRuntime.cpp (original)
+++ cfe/branches/release_40/lib/CodeGen/CGOpenMPRuntime.cpp Fri Feb 24 12:42:59 2017
@@ -4697,9 +4697,7 @@ void CGOpenMPRuntime::emitCancellationPo
// global_tid, kmp_int32 cncl_kind);
if (auto *OMPRegionInfo =
dyn_cast_or_null<CGOpenMPRegionInfo>(CGF.CapturedStmtInfo)) {
- // For 'cancellation point taskgroup', the task region info may not have a
- // cancel. This may instead happen in another adjacent task.
- if (CancelRegion == OMPD_taskgroup || OMPRegionInfo->hasCancel()) {
+ if (OMPRegionInfo->hasCancel()) {
llvm::Value *Args[] = {
emitUpdateLocation(CGF, Loc), getThreadID(CGF, Loc),
CGF.Builder.getInt32(getCancellationKind(CancelRegion))};
Modified: cfe/branches/release_40/lib/Frontend/InitPreprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Frontend/InitPreprocessor.cpp?rev=296150&r1=296149&r2=296150&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Frontend/InitPreprocessor.cpp (original)
+++ cfe/branches/release_40/lib/Frontend/InitPreprocessor.cpp Fri Feb 24 12:42:59 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 TypeAlign,
- unsigned InlineWidth) {
+static const char *getLockFreeValue(unsigned TypeWidth, unsigned InlineWidth) {
// Fully-aligned, power-of-2 sizes no larger than the inline
// width will be inlined as lock-free operations.
- if (TypeWidth == TypeAlign && (TypeWidth & (TypeWidth - 1)) == 0 &&
- TypeWidth <= InlineWidth)
+ // Note: we do not need to check alignment since _Atomic(T) is always
+ // appropriately-aligned in clang.
+ if ((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.
@@ -881,7 +881,6 @@ 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);
@@ -894,7 +893,6 @@ 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/branches/release_40/test/OpenMP/cancellation_point_codegen.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/OpenMP/cancellation_point_codegen.cpp?rev=296150&r1=296149&r2=296150&view=diff
==============================================================================
--- cfe/branches/release_40/test/OpenMP/cancellation_point_codegen.cpp (original)
+++ cfe/branches/release_40/test/OpenMP/cancellation_point_codegen.cpp Fri Feb 24 12:42:59 2017
@@ -78,12 +78,6 @@ for (int i = 0; i < argc; ++i) {
}
// CHECK: call i8* @__kmpc_omp_task_alloc(
// CHECK: call i32 @__kmpc_omp_task(
-#pragma omp task
-{
-#pragma omp cancellation point taskgroup
-}
-// CHECK: call i8* @__kmpc_omp_task_alloc(
-// CHECK: call i32 @__kmpc_omp_task(
#pragma omp parallel sections
{
{
@@ -124,15 +118,6 @@ for (int i = 0; i < argc; ++i) {
// CHECK: define internal i32 @{{[^(]+}}(i32
// CHECK: [[RES:%.+]] = call i32 @__kmpc_cancellationpoint(%ident_t* {{[^,]+}}, i32 {{[^,]+}}, i32 4)
-// CHECK: [[CMP:%.+]] = icmp ne i32 [[RES]], 0
-// CHECK: br i1 [[CMP]], label %[[EXIT:[^,]+]],
-// CHECK: [[EXIT]]
-// CHECK: br label %[[RETURN:.+]]
-// CHECK: [[RETURN]]
-// CHECK: ret i32 0
-
-// CHECK: define internal i32 @{{[^(]+}}(i32
-// CHECK: [[RES:%.+]] = call i32 @__kmpc_cancellationpoint(%ident_t* {{[^,]+}}, i32 {{[^,]+}}, i32 4)
// CHECK: [[CMP:%.+]] = icmp ne i32 [[RES]], 0
// CHECK: br i1 [[CMP]], label %[[EXIT:[^,]+]],
// CHECK: [[EXIT]]
Modified: cfe/branches/release_40/test/Sema/atomic-ops.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/Sema/atomic-ops.c?rev=296150&r1=296149&r2=296150&view=diff
==============================================================================
--- cfe/branches/release_40/test/Sema/atomic-ops.c (original)
+++ cfe/branches/release_40/test/Sema/atomic-ops.c Fri Feb 24 12:42:59 2017
@@ -14,11 +14,7 @@ _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), "");
More information about the llvm-branch-commits
mailing list