<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On Apr 9, 2013, at 10:52 AM, Fariborz Jahanian <<a href="mailto:fjahanian@apple.com">fjahanian@apple.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">Author: fjahanian<br>Date: Tue Apr 9 12:52:29 2013<br>New Revision: 179108<br><br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project?rev=179108&view=rev">http://llvm.org/viewvc/llvm-project?rev=179108&view=rev</a><br>Log:<br>Objective-C: This patch fixes a none-issuance of warning<br>when result type of protocol property and getter method<br>differ by fixing a more serious problem. When a forward<br>protocol declaration comes between its definition and<br>its use in class protocol list, the forward protocol<br>ast was being used in building the protocol list.<br>//<span class="Apple-converted-space"> </span><a href="rdar://12522752">rdar://12522752</a><br></div></blockquote><div><br></div><div>Why is this a problem? The protocol list could have a reference to the protocol declaration that was actually visible, and the callers that need definitions should use getDefinition().</div><div><br></div><div><span class="Apple-tab-span" style="white-space:pre"> </span>- Doug</div><div><br></div><br><blockquote type="cite"><div style="letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">Modified:<br> cfe/trunk/lib/Sema/SemaDeclObjC.cpp<br> cfe/trunk/test/SemaObjC/method-conflict-2.m<br><br>Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=179108&r1=179107&r2=179108&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=179108&r1=179107&r2=179108&view=diff</a><br>==============================================================================<br>--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)<br>+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Tue Apr 9 12:52:29 2013<br>@@ -745,7 +745,10 @@ Sema::FindProtocolDeclaration(bool WarnO<br> << ProtocolId[i].first;<br> continue;<br> }<br>-<br>+ // If this is a forward protocol declaration, get its definition.<br>+ if (!PDecl->isThisDeclarationADefinition() && PDecl->getDefinition())<br>+ PDecl = PDecl->getDefinition();<br>+ <br> (void)DiagnoseUseOfDecl(PDecl, ProtocolId[i].second);<br><br> // If this is a forward declaration and we are supposed to warn in this<br><br>Modified: cfe/trunk/test/SemaObjC/method-conflict-2.m<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/method-conflict-2.m?rev=179108&r1=179107&r2=179108&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/method-conflict-2.m?rev=179108&r1=179107&r2=179108&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/SemaObjC/method-conflict-2.m (original)<br>+++ cfe/trunk/test/SemaObjC/method-conflict-2.m Tue Apr 9 12:52:29 2013<br>@@ -1,4 +1,5 @@<br>// RUN: %clang_cc1 -Wmethod-signatures -fsyntax-only -verify -Wno-objc-root-class %s<br>+// RUN: %clang_cc1 -x objective-c++ -Wmethod-signatures -fsyntax-only -verify -Wno-objc-root-class %s<br><br>@interface A @end<br>@interface B : A @end<br>@@ -42,3 +43,24 @@<br>- (A*) test1 { return 0; } // id -> A* is<span class="Apple-converted-space"> </span><a href="rdar://problem/8596987">rdar://problem/8596987</a><br>- (id) test2 { return 0; }<br>@end<br>+<br>+//<span class="Apple-converted-space"> </span><a href="rdar://12522752">rdar://12522752</a><br>+typedef int int32_t;<br>+typedef long long int64_t;<br>+<br>+@interface NSObject @end<br>+<br>+@protocol CKMessage<br>+@property (nonatomic,readonly,assign) int64_t sequenceNumber; // expected-note {{previous definition is here}}<br>+@end<br>+<br>+@protocol CKMessage;<br>+<br>+@interface CKIMMessage : NSObject<CKMessage><br>+@end<br>+<br>+@implementation CKIMMessage<br>+- (int32_t)sequenceNumber { // expected-warning {{conflicting return type in implementation of 'sequenceNumber': 'int64_t' (aka 'long long') vs 'int32_t' (aka 'int')}}<br>+ return 0;<br>+}<br>+@end<br><br><br>_______________________________________________<br>cfe-commits mailing list<br><a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br><a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a></div></blockquote></div><br></body></html>