r215453 - Allow @synchronized to contextually convert a C++ object to an ObjC object pointer.

[Jordan Rose]

Author: jrose
Date: Tue Aug 12 11:20:36 2014
New Revision: 215453

URL: http://llvm.org/viewvc/llvm-project?rev=215453&view=rev
Log:
Allow @synchronized to contextually convert a C++ object to an ObjC object pointer.

Patch by Grant Paul!

Added:
    cfe/trunk/test/SemaObjCXX/synchronized.mm
Modified:
    cfe/trunk/lib/Sema/SemaStmt.cpp

Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=215453&r1=215452&r2=215453&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Tue Aug 12 11:20:36 2014
@@ -3102,9 +3102,24 @@ Sema::ActOnObjCAtSynchronizedOperand(Sou
   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.

Added: cfe/trunk/test/SemaObjCXX/synchronized.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/synchronized.mm?rev=215453&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjCXX/synchronized.mm (added)
+++ cfe/trunk/test/SemaObjCXX/synchronized.mm Tue Aug 12 11:20:36 2014
@@ -0,0 +1,20 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+
+ at interface PBXTrackableTaskManager @end
+ at 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)}}
+  }
+}