[cfe-commits] r145552 - in /cfe/trunk: include/clang/Sema/Sema.h lib/Sema/SemaExpr.cpp lib/Sema/SemaExprObjC.cpp test/SemaObjC/unknown-anytype.m

[Douglas Gregor]

Author: dgregor
Date: Wed Nov 30 19:37:36 2011
New Revision: 145552

URL: http://llvm.org/viewvc/llvm-project?rev=145552&view=rev
Log:
When sending a message to a receiver that has "unknown any" type,
force the unknown any type to "id" so that the message send can be
completed without requiring a case. Fixes <rdar://problem/10506646>.

Added:
    cfe/trunk/test/SemaObjC/unknown-anytype.m
Modified:
    cfe/trunk/include/clang/Sema/Sema.h
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/lib/Sema/SemaExprObjC.cpp

Modified: cfe/trunk/include/clang/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=145552&r1=145551&r2=145552&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Sema.h (original)
+++ cfe/trunk/include/clang/Sema/Sema.h Wed Nov 30 19:37:36 2011
@@ -5873,6 +5873,10 @@
                                  Expr *CastExpr, CastKind &CastKind,
                                  ExprValueKind &VK, CXXCastPath &Path);
 
+  /// \brief Force an expression with unknown-type to an expression of the
+  /// given type.
+  ExprResult forceUnknownAnyToType(Expr *E, QualType ToType);
+                             
   // CheckVectorCast - check type constraints for vectors.
   // Since vectors are an extension, there are no C standard reference for this.
   // We allow casting between vectors and integer datatypes of the same size.

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=145552&r1=145551&r2=145552&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Nov 30 19:37:36 2011
@@ -3691,6 +3691,11 @@
   }
 
   // If we're directly calling a function, get the appropriate declaration.
+  if (Fn->getType() == Context.UnknownAnyTy) {
+    ExprResult result = rebuildUnknownAnyFunction(*this, Fn);
+    if (result.isInvalid()) return ExprError();
+    Fn = result.take();
+  }
 
   Expr *NakedFn = Fn->IgnoreParens();
 
@@ -10110,6 +10115,10 @@
   return CastExpr;
 }
 
+ExprResult Sema::forceUnknownAnyToType(Expr *E, QualType ToType) {
+  return RebuildUnknownAnyExpr(*this, ToType).Visit(E);
+}
+
 static ExprResult diagnoseUnknownAnyExpr(Sema &S, Expr *E) {
   Expr *orig = E;
   unsigned diagID = diag::err_uncasted_use_of_unknown_any;

Modified: cfe/trunk/lib/Sema/SemaExprObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprObjC.cpp?rev=145552&r1=145551&r2=145552&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprObjC.cpp Wed Nov 30 19:37:36 2011
@@ -1211,9 +1211,13 @@
   // and determine receiver type.
   if (Receiver) {
     if (Receiver->hasPlaceholderType()) {
-      ExprResult result = CheckPlaceholderExpr(Receiver);
-      if (result.isInvalid()) return ExprError();
-      Receiver = result.take();
+      ExprResult Result;
+      if (Receiver->getType() == Context.UnknownAnyTy)
+        Result = forceUnknownAnyToType(Receiver, Context.getObjCIdType());
+      else
+        Result = CheckPlaceholderExpr(Receiver);
+      if (Result.isInvalid()) return ExprError();
+      Receiver = Result.take();
     }
 
     if (Receiver->isTypeDependent()) {

Added: cfe/trunk/test/SemaObjC/unknown-anytype.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/unknown-anytype.m?rev=145552&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/unknown-anytype.m (added)
+++ cfe/trunk/test/SemaObjC/unknown-anytype.m Wed Nov 30 19:37:36 2011
@@ -0,0 +1,24 @@
+// RUN: %clang_cc1 -funknown-anytype -fsyntax-only -fdebugger-support -verify %s
+
+extern __unknown_anytype test0;
+extern __unknown_anytype test1();
+
+ at interface A
+- (int*)getIntPtr;
+- (double*)getSomePtr;
+ at end
+
+ at interface B
+- (float*)getFloatPtr;
+- (short*)getSomePtr;
+ at end
+
+void test_unknown_anytype_receiver() {
+  int *ip = [test0 getIntPtr];
+  float *fp = [test1() getFloatPtr];
+  double *dp = [test1() getSomePtr]; // okay: picks first method found
+  [[test0 unknownMethod] otherUnknownMethod]; // expected-error{{no known method '-otherUnknownMethod'; cast the message send to the method's return type}}
+  (void)(int)[[test0 unknownMethod] otherUnknownMethod];;
+  [[test1() unknownMethod] otherUnknownMethod]; // expected-error{{no known method '-otherUnknownMethod'; cast the message send to the method's return type}}
+  (void)(id)[[test1() unknownMethod] otherUnknownMethod];
+}