[cfe-commits] r55705 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaObjC/conditional-expr-2.m test/SemaObjC/conditional-expr-3.m test/SemaObjC/conditional-expr.m test/SemaObjC/conditional-expr2.m
Daniel Dunbar
daniel at zuster.org
Wed Sep 3 10:53:25 PDT 2008
Author: ddunbar
Date: Wed Sep 3 12:53:25 2008
New Revision: 55705
URL: http://llvm.org/viewvc/llvm-project?rev=55705&view=rev
Log:
Improve type-checking of ?: for Objective-C types.
- Allow any Objective-C object types to devolve to type id in a ?:
expression. This matches gcc behavior more closely.
Added:
cfe/trunk/test/SemaObjC/conditional-expr-2.m
- copied, changed from r55637, cfe/trunk/test/SemaObjC/conditional-expr2.m
cfe/trunk/test/SemaObjC/conditional-expr-3.m
Removed:
cfe/trunk/test/SemaObjC/conditional-expr2.m
Modified:
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/test/SemaObjC/conditional-expr.m
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=55705&r1=55704&r2=55705&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Sep 3 12:53:25 2008
@@ -1252,6 +1252,23 @@
ImpCastExprToType(lex, rexT); // promote the null to a pointer.
return rexT;
}
+ // Allow any Objective-C types to devolve to id type.
+ // FIXME: This seems to match gcc behavior, although that is very
+ // arguably incorrect. For example, (xxx ? (id<P>) : (id<P>)) has
+ // type id, which seems broken.
+ if (Context.isObjCObjectPointerType(lexT) &&
+ Context.isObjCObjectPointerType(rexT)) {
+ // FIXME: This is not the correct composite type. This only
+ // happens to work because id can more or less be used anywhere,
+ // however this may change the type of method sends.
+ // FIXME: gcc adds some type-checking of the arguments and emits
+ // (confusing) incompatible comparison warnings in some
+ // cases. Investigate.
+ QualType compositeType = Context.getObjCIdType();
+ ImpCastExprToType(lex, compositeType);
+ ImpCastExprToType(rex, compositeType);
+ return compositeType;
+ }
// Handle the case where both operands are pointers before we handle null
// pointer constants in case both operands are null pointer constants.
if (const PointerType *LHSPT = lexT->getAsPointerType()) { // C99 6.5.15p3,6
@@ -1312,18 +1329,6 @@
return compositeType;
}
}
- // Need to handle "id<xx>" explicitly. Unlike "id", whose canonical type
- // evaluates to "struct objc_object *" (and is handled above when comparing
- // id with statically typed objects).
- if (lexT->isObjCQualifiedIdType() || rexT->isObjCQualifiedIdType()) {
- if (ObjCQualifiedIdTypesAreCompatible(lexT, rexT, true)) {
- // FIXME: This is not the correct composite type.
- QualType compositeType = Context.getObjCIdType();
- ImpCastExprToType(lex, compositeType);
- ImpCastExprToType(rex, compositeType);
- return compositeType;
- }
- }
// Otherwise, the operands are not compatible.
Diag(questionLoc, diag::err_typecheck_cond_incompatible_operands,
lexT.getAsString(), rexT.getAsString(),
Copied: cfe/trunk/test/SemaObjC/conditional-expr-2.m (from r55637, cfe/trunk/test/SemaObjC/conditional-expr2.m)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/conditional-expr-2.m?p2=cfe/trunk/test/SemaObjC/conditional-expr-2.m&p1=cfe/trunk/test/SemaObjC/conditional-expr2.m&r1=55637&r2=55705&rev=55705&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/conditional-expr2.m (original)
+++ cfe/trunk/test/SemaObjC/conditional-expr-2.m Wed Sep 3 12:53:25 2008
@@ -8,5 +8,5 @@
void f0(int cond, A *a, B *b) {
// Ensure that we can still send a message to result of incompatible
// conditional expression.
- [ (cond ? a : b) test ]; // expected-warning {{pointer type mismatch}}, expected-warning {{method '-test' not found}}
+ [ (cond ? a : b) test ]; // expected-warning {{method '-test' not found}}
}
Added: cfe/trunk/test/SemaObjC/conditional-expr-3.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/conditional-expr-3.m?rev=55705&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/conditional-expr-3.m (added)
+++ cfe/trunk/test/SemaObjC/conditional-expr-3.m Wed Sep 3 12:53:25 2008
@@ -0,0 +1,63 @@
+// RUN: clang -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);
+}
+
+void f9(int cond, id<P0,P1> x0, id<P0,P2> x1) {
+ barP1(cond ? x0 : x1);
+}
+
+void f10(int cond, id<P0,P1> x0, id<P0,P2> x1) {
+ barP2(cond ? x0 : x1);
+}
Modified: cfe/trunk/test/SemaObjC/conditional-expr.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/conditional-expr.m?rev=55705&r1=55704&r2=55705&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/conditional-expr.m (original)
+++ cfe/trunk/test/SemaObjC/conditional-expr.m Wed Sep 3 12:53:25 2008
@@ -29,7 +29,7 @@
id <DTOutputStreams> nextOutputStream = [self nextOutputStream];
// GCC warns about both of these.
self = nextOutputStream; // expected-error {{incompatible type assigning 'id<DTOutputStreams>', expected 'DTFilterOutputStream2 *'}}
- return nextOutputStream ? nextOutputStream : self; // expected-error {{incompatible operand types ('id<DTOutputStreams>' and 'DTFilterOutputStream2 *')}}
+ return nextOutputStream ? nextOutputStream : self;
}
@end
@@ -39,6 +39,6 @@
id <DTOutputStreams> nextOutputStream = [self nextOutputStream];
// GCC warns about both of these as well (no errors).
self = nextOutputStream; // expected-error {{incompatible type assigning 'id<DTOutputStreams>', expected 'DTFilterOutputStream3 *'}}
- return nextOutputStream ? nextOutputStream : self; // expected-error {{incompatible operand types ('id<DTOutputStreams>' and 'DTFilterOutputStream3 *')}}
+ return nextOutputStream ? nextOutputStream : self;
}
@end
Removed: cfe/trunk/test/SemaObjC/conditional-expr2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/conditional-expr2.m?rev=55704&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/conditional-expr2.m (original)
+++ cfe/trunk/test/SemaObjC/conditional-expr2.m (removed)
@@ -1,12 +0,0 @@
-// RUN: clang -fsyntax-only -verify %s
-
- at interface A
- at end
- at interface B
- at end
-
-void f0(int cond, A *a, B *b) {
- // Ensure that we can still send a message to result of incompatible
- // conditional expression.
- [ (cond ? a : b) test ]; // expected-warning {{pointer type mismatch}}, expected-warning {{method '-test' not found}}
-}
More information about the cfe-commits
mailing list