diff options
| -rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 21 | ||||
| -rw-r--r-- | clang/test/SemaObjCXX/synchronized.mm | 20 |
2 files changed, 38 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 6bb71eb8958..12e0ef7fa6c 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -3102,9 +3102,24 @@ Sema::ActOnObjCAtSynchronizedOperand(SourceLocation atLoc, Expr *operand) { if (!type->isDependentType() && !type->isObjCObjectPointerType()) { const PointerType *pointerType = type->getAs<PointerType>(); - if (!pointerType || !pointerType->getPointeeType()->isVoidType()) - return Diag(atLoc, diag::error_objc_synchronized_expects_object) - << type << operand->getSourceRange(); + if (!pointerType || !pointerType->getPointeeType()->isVoidType()) { + if (getLangOpts().CPlusPlus) { + if (RequireCompleteType(atLoc, type, + diag::err_incomplete_receiver_type)) + return Diag(atLoc, diag::error_objc_synchronized_expects_object) + << type << operand->getSourceRange(); + + ExprResult result = PerformContextuallyConvertToObjCPointer(operand); + if (!result.isUsable()) + return Diag(atLoc, diag::error_objc_synchronized_expects_object) + << type << operand->getSourceRange(); + + operand = result.get(); + } else { + return Diag(atLoc, diag::error_objc_synchronized_expects_object) + << type << operand->getSourceRange(); + } + } } // The operand to @synchronized is a full-expression. diff --git a/clang/test/SemaObjCXX/synchronized.mm b/clang/test/SemaObjCXX/synchronized.mm new file mode 100644 index 00000000000..37305c5cca8 --- /dev/null +++ b/clang/test/SemaObjCXX/synchronized.mm @@ -0,0 +1,20 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s + +@interface PBXTrackableTaskManager @end +@implementation PBXTrackableTaskManager @end + +struct x { + operator PBXTrackableTaskManager *() const { return 0; } +} a; + +struct y { + operator int *() const { return 0; } +} b; + +void test1() { + @synchronized (a) { + } + + @synchronized (b) { // expected-error {{@synchronized requires an Objective-C object type ('struct y' invalid)}} + } +} |
