[cfe-commits] r91059 - in /cfe/trunk: lib/Sema/SemaExprCXX.cpp test/SemaObjCXX/conditional-expr.mm

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Dec 10 14:46:08 2009
New Revision: 91059

URL: http://llvm.org/viewvc/llvm-project?rev=91059&view=rev
Log:
Add support for finding composite type of twp objective-c pointers
in objective-c++ mode.

Added:
    cfe/trunk/test/SemaObjCXX/conditional-expr.mm
Modified:
    cfe/trunk/lib/Sema/SemaExprCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=91059&r1=91058&r2=91059&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Thu Dec 10 14:46:08 2009
@@ -1806,6 +1806,11 @@
   QualType Composite = FindCompositePointerType(LHS, RHS);
   if (!Composite.isNull())
     return Composite;
+  
+  // Similarly, attempt to find composite type of twp objective-c pointers.
+  Composite = FindCompositeObjCPointerType(LHS, RHS, QuestionLoc);
+  if (!Composite.isNull())
+    return Composite;
 
   // Fourth bullet is same for pointers-to-member. However, the possible
   // conversions are far more limited: we have null-to-pointer, upcast of

Added: cfe/trunk/test/SemaObjCXX/conditional-expr.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/conditional-expr.mm?rev=91059&view=auto

==============================================================================
--- cfe/trunk/test/SemaObjCXX/conditional-expr.mm (added)
+++ cfe/trunk/test/SemaObjCXX/conditional-expr.mm Thu Dec 10 14:46:08 2009
@@ -0,0 +1,67 @@
+// RUN: clang-cc -x objective-c++ -fsyntax-only -verify %s
+
+ at protocol P0
+ at end
+ at protocol P1
+ at end
+ at protocol P2
+ at end
+
+ at interface A <P0>
+ at end
+
+ at interface B : A
+ at end
+
+void bar(id x);
+void barP0(id<P0> x);
+void barP1(id<P1> x);
+void barP2(id<P2> x);
+
+void f0(A *a) {
+  id l = a;
+}
+
+void f1(id x, A *a) {
+  id<P0> l = a;
+}
+
+void f2(id<P1> x) {
+  id<P0> l = x; // expected-error {{incompatible type initializing 'id<P1>', expected 'id<P0>'}}
+}
+
+void f3(A *a) {
+  id<P1> l = a; // expected-error {{incompatible type initializing 'A *', expected 'id<P1>'}}
+}
+
+void f4(int cond, id x, A *a) {
+  bar(cond ? x : a);
+}
+
+void f5(int cond, A *a, B *b) {
+  bar(cond ? a : b);
+}
+
+void f6(int cond, id x, A *a) {
+  bar(cond ? (id<P0, P1>) x : a);
+}
+
+void f7(int cond, id x, A *a) {
+  bar(cond ? a : (id<P0, P1>) x);
+}
+
+void f8(int cond, id<P0,P1> x0, id<P0,P2> x1) {
+  barP0(cond ? x0 : x1); // expected-warning {{incompatible operand types ('id<P0,P1>' and 'id<P0,P2>')}}
+}
+
+void f9(int cond, id<P0,P1> x0, id<P0,P2> x1) {
+  barP1(cond ? x0 : x1); // expected-warning {{incompatible operand types ('id<P0,P1>' and 'id<P0,P2>')}}
+}
+
+void f10(int cond, id<P0,P1> x0, id<P0,P2> x1) {
+  barP2(cond ? x0 : x1); // expected-warning {{incompatible operand types ('id<P0,P1>' and 'id<P0,P2>')}}
+}
+
+int f11(int cond, A* a, B* b) {
+  return (cond? b : a)->x; // expected-error{{'A' does not have a member named 'x'}}
+}