diff options
| -rw-r--r-- | lib/Sema/SemaChecking.cpp | 2 | ||||
| -rw-r--r-- | test/SemaObjC/exprs.m | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index 0ed2f33e0e..790e7671ed 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -427,7 +427,7 @@ Sema::SemaBuiltinAtomicOverloaded(ExprResult TheCallResult) { QualType ValType = FirstArg->getType()->getAs<PointerType>()->getPointeeType(); - if (!ValType->isIntegerType() && !ValType->isPointerType() && + if (!ValType->isIntegerType() && !ValType->isAnyPointerType() && !ValType->isBlockPointerType()) { Diag(DRE->getLocStart(), diag::err_atomic_builtin_must_be_pointer_intptr) << FirstArg->getType() << FirstArg->getSourceRange(); diff --git a/test/SemaObjC/exprs.m b/test/SemaObjC/exprs.m index 3370bda051..13c34e5650 100644 --- a/test/SemaObjC/exprs.m +++ b/test/SemaObjC/exprs.m @@ -22,3 +22,13 @@ void test2() { #define MAX(A,B) ({ __typeof__(A) __a = (A); __typeof__(B) __b = (B); __a < __b ? __b : __a; }) void (^foo)(int, int) = ^(int x, int y) { int z = MAX(x, y); }; + + + +// rdar://8445858 +@class Object; +static Object *g; +void test3(Object *o) { + // this is ok. + __sync_bool_compare_and_swap(&g, 0, o); +} |