Author: snaroff
Date: Wed Oct 22 17:40:28 2008
New Revision: 58007
URL: http://llvm.org/viewvc/llvm-project?rev=58007&view=rev
Log:
Fix <rdar://problem/6311947> clang on xcode (regression): error: use of
undeclared identifier 'expandedValue'.
Mea culpa: I introduced this regresson in the following 2 commits: r57529
(10/14), r57841 (10/20).
Added:
cfe/trunk/test/SemaObjC/compare-qualified-id.m
Modified:
cfe/trunk/lib/Sema/SemaExpr.cpp
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=58007&r1=58006&r2=58007&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Oct 22 17:40:28 2008
@@ -2153,7 +2153,7 @@
Diag(loc, diag::ext_typecheck_comparison_of_distinct_pointers,
lType.getAsString(), rType.getAsString(),
lex->getSourceRange(), rex->getSourceRange());
- return QualType();
+ return Context.IntTy;
}
if (ObjCQualifiedIdTypesAreCompatible(lType, rType, true)) {
ImpCastExprToType(rex, lType);
@@ -2163,7 +2163,7 @@
Diag(loc, diag::warn_incompatible_qualified_id_operands,
lex->getType().getAsString(), rex->getType().getAsString(),
lex->getSourceRange(), rex->getSourceRange());
- return QualType();
+ return Context.IntTy;
}
}
}
Added: cfe/trunk/test/SemaObjC/compare-qualified-id.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/compare-qualified-id.m?rev=58007&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/compare-qualified-id.m (added)
+++ cfe/trunk/test/SemaObjC/compare-qualified-id.m Wed Oct 22 17:40:28 2008
@@ -0,0 +1,33 @@
+// RUN: clang -fsyntax-only -verify %s
+
+typedef signed char BOOL;
+typedef unsigned int NSUInteger;
+typedef struct _NSZone NSZone;
[EMAIL PROTECTED] NSInvocation, NSMethodSignature, NSCoder, NSString,
NSEnumerator;
[EMAIL PROTECTED] NSObject - (BOOL)isEqual:(id)object; @end
[EMAIL PROTECTED] NSCopying - (id)copyWithZone:(NSZone *)zone; @end
[EMAIL PROTECTED] NSMutableCopying - (id)mutableCopyWithZone:(NSZone *)zone;
@end
[EMAIL PROTECTED] NSCoding - (void)encodeWithCoder:(NSCoder *)aCoder; @end
[EMAIL PROTECTED] NSObject <NSObject> {} @end
+typedef struct {} NSFastEnumerationState;
[EMAIL PROTECTED] NSFastEnumeration -
(NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
objects:(id *)stackbuf count:(NSUInteger)len; @end
[EMAIL PROTECTED] NSDictionary : NSObject <NSCopying, NSMutableCopying,
NSCoding, NSFastEnumeration> - (NSUInteger)count; @end
[EMAIL PROTECTED] NSMutableDictionary : NSDictionary -
(void)removeObjectForKey:(id)aKey; @end
+extern NSString * const NSTaskDidTerminateNotification;
+
[EMAIL PROTECTED] XCPropertyExpansionContext : NSObject <NSCopying> {
+ NSMutableDictionary * _propNamesToPropValuesCache;
+} @end
+
[EMAIL PROTECTED] XCPropertyValues <NSObject, NSCopying>
+- (NSString *)evaluateAsStringInContext:(XCPropertyExpansionContext *)context
withNestingState:(const void *)state;
[EMAIL PROTECTED]
+
[EMAIL PROTECTED] XCPropertyExpansionContext
+- (NSString *)expandedValueForProperty:(NSString *)property {
+ id <XCPropertyValues> cachedValueNode = [_propNamesToPropValuesCache
objectForKey:property]; // expected-warning {{method '-objectForKey:' not found
(return type defaults to 'id')}}
+ if (cachedValueNode == ((void *)0)) { } // expected-warning {{comparison of
distinct pointer types ('id<XCPropertyValues>' and 'void *')}}
+ NSString * expandedValue = [cachedValueNode evaluateAsStringInContext:self
withNestingState:((void *)0)];
+ return expandedValue;
+}
+
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
