[cfe-commits] r69980 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaObjC/sizeof-interface.m

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Apr 24 12:34:33 2009
New Revision: 69980

URL: http://llvm.org/viewvc/llvm-project?rev=69980&view=rev
Log:
Avoid issuing spurious errors as side-effect of diagnosing
application of sizeof on an interface.

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/SemaObjC/sizeof-interface.m

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Fri Apr 24 12:34:33 2009
@@ -1251,10 +1251,10 @@
     return true;
   
   // Reject sizeof(interface) and sizeof(interface<proto>) in 64-bit mode.
-  if (exprType->isObjCInterfaceType() && LangOpts.ObjCNonFragileABI) {
+  if (LangOpts.ObjCNonFragileABI && exprType->isObjCInterfaceType()) {
     Diag(OpLoc, diag::err_sizeof_nonfragile_interface)
       << exprType << isSizeof;
-    return true;
+    return false;
   }
     
   return false;

Modified: cfe/trunk/test/SemaObjC/sizeof-interface.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/sizeof-interface.m?rev=69980&r1=69979&r2=69980&view=diff

==============================================================================
--- cfe/trunk/test/SemaObjC/sizeof-interface.m (original)
+++ cfe/trunk/test/SemaObjC/sizeof-interface.m Fri Apr 24 12:34:33 2009
@@ -52,3 +52,22 @@
   return P[4].x[2];  // expected-error {{subscript requires size of interface 'I0', which is not constant in non-fragile ABI}}
 }
 
+
+ at interface I @end
+
+ at interface XCAttributeRunDirectNode
+{
+    @public
+    unsigned long attributeRuns[1024 + sizeof(I)]; // expected-error {{invalid application of 'sizeof' to interface 'I' in non-fragile ABI}}
+    int i;
+}
+ at end
+
+ at implementation XCAttributeRunDirectNode
+
+- (unsigned long)gatherStats:(id )stats
+{
+        return attributeRuns[i];
+}
+ at end
+