Author: snaroff
Date: Mon Dec 8 14:57:28 2008
New Revision: 60716
URL: http://llvm.org/viewvc/llvm-project?rev=60716&view=rev
Log:
ObjCInterfaceDecl::lookupInstanceMethod() needs to look through a categories
protocols.
Fixes <rdar://problem/6418640> clang on prokit: error: incompatible type
returning 'id', expected 'NSSize'
Added:
cfe/trunk/test/SemaObjC/super-cat-prot.m
Modified:
cfe/trunk/lib/AST/DeclObjC.cpp
Modified: cfe/trunk/lib/AST/DeclObjC.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclObjC.cpp?rev=60716&r1=60715&r2=60716&view=diff
==============================================================================
--- cfe/trunk/lib/AST/DeclObjC.cpp (original)
+++ cfe/trunk/lib/AST/DeclObjC.cpp Mon Dec 8 14:57:28 2008
@@ -685,6 +685,14 @@
while (CatDecl) {
if ((MethodDecl = CatDecl->getInstanceMethod(Sel)))
return MethodDecl;
+
+ // Didn't find one yet - look through protocols.
+ const ObjCList<ObjCProtocolDecl> &Protocols =
+ CatDecl->getReferencedProtocols();
+ for (ObjCList<ObjCProtocolDecl>::iterator I = Protocols.begin(),
+ E = Protocols.end(); I != E; ++I)
+ if ((MethodDecl = (*I)->getInstanceMethod(Sel)))
+ return MethodDecl;
CatDecl = CatDecl->getNextClassCategory();
}
ClassDecl = ClassDecl->getSuperClass();
Added: cfe/trunk/test/SemaObjC/super-cat-prot.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/super-cat-prot.m?rev=60716&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/super-cat-prot.m (added)
+++ cfe/trunk/test/SemaObjC/super-cat-prot.m Mon Dec 8 14:57:28 2008
@@ -0,0 +1,48 @@
+// RUN: clang -fsyntax-only -verify %s
+typedef signed char BOOL;
+typedef unsigned int NSUInteger;
[EMAIL PROTECTED] NSInvocation, NSMethodSignature, NSCoder, NSString,
NSEnumerator;
[EMAIL PROTECTED] NSObject - (BOOL)isEqual:(id)object; @end
[EMAIL PROTECTED] NSCoding - (void)encodeWithCoder:(NSCoder *)aCoder; @end
[EMAIL PROTECTED] NSObject <NSObject> {} @end
+typedef float CGFloat;
+typedef struct _NSSize {} NSSize;
+typedef struct _NSRect {} NSRect;
[EMAIL PROTECTED] NSResponder : NSObject <NSCoding> {} @end
[EMAIL PROTECTED] NSAnimatablePropertyContainer - (id)animator; @end
+extern NSString *NSAnimationTriggerOrderIn ;
[EMAIL PROTECTED] NSView : NSResponder <NSAnimatablePropertyContainer> {} @end
[EMAIL PROTECTED] NSAttributedString, NSEvent, NSFont, NSFormatter, NSImage,
NSMenu, NSText, NSView;
+enum { NSBoxPrimary = 0, NSBoxSecondary = 1, NSBoxSeparator = 2, NSBoxOldStyle
= 3, NSBoxCustom = 4};
+typedef NSUInteger NSBoxType;
[EMAIL PROTECTED] NSBox : NSView {} - (NSBoxType)boxType; @end
[EMAIL PROTECTED] NSArray, NSError, NSImage, NSView, NSNotificationCenter,
NSURL;
[EMAIL PROTECTED] NSProBox:NSBox {} @end
+enum IBKnobPosition { IBNoKnobPosition = -1, IBBottomLeftKnobPosition = 0,
+ IBMiddleLeftKnobPosition, IBTopLeftKnobPosition,
+ IBTopMiddleKnobPosition, IBTopRightKnobPosition,
+ IBMiddleRightKnobPosition, IBBottomRightKnobPosition,
+ IBBottomMiddleKnobPosition };
+typedef enum IBKnobPosition IBKnobPosition;
+typedef struct _IBInset {} IBInset;
[EMAIL PROTECTED] IBObjectProtocol -(NSString *)inspectorClassName; @end
[EMAIL PROTECTED] IBViewProtocol
+ -(NSSize)minimumFrameSizeFromKnobPosition:(IBKnobPosition)position;
+ -(IBInset)ibShadowInset;
[EMAIL PROTECTED]
[EMAIL PROTECTED] NSPasteboard;
[EMAIL PROTECTED] NSObject (NSObject_IBObjectProtocol) <IBObjectProtocol> @end
[EMAIL PROTECTED] NSView (NSView_IBViewProtocol) <IBViewProtocol> -
(NSRect)layoutRect; @end
+typedef enum { NSProTextFieldSquareBezel = 0, NSProTextFieldRoundedBezel = 1,
NSProTextFieldDisplayBezel = 2 } MKModuleReusePolicy;
[EMAIL PROTECTED] NSProBox(IBAdditions)
+-(NSString *)inspectorClassName {}
+-(IBInset)ibShadowInset {
+ if ([self boxType] == NSBoxSeparator) {
+ return [super ibShadowInset];
+ }
+}
+-(NSSize)minimumFrameSizeFromKnobPosition:(IBKnobPosition)knobPosition {
+ if ([self boxType] != NSBoxSeparator)
+ return [super minimumFrameSizeFromKnobPosition:knobPosition];
+}
[EMAIL PROTECTED]
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
