[cfe-commits] r70637 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaCXX/offsetof.cpp

[Anders Carlsson]

Author: andersca
Date: Sat May  2 13:36:10 2009
New Revision: 70637

URL: http://llvm.org/viewvc/llvm-project?rev=70637&view=rev
Log:
Fix a thinko and a test.

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/SemaCXX/offsetof.cpp

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Sat May  2 13:36:10 2009
@@ -4734,6 +4734,8 @@
       << SourceRange(CompPtr[1].LocStart, CompPtr[NumComponents-1].LocEnd);
 
   if (!Dependent) {
+    bool DidWarnAboutNonPOD;
+    
     // FIXME: Dependent case loses a lot of information here. And probably
     // leaks like a sieve.
     for (unsigned i = 0; i != NumComponents; ++i) {
@@ -4776,10 +4778,12 @@
       // Get the decl corresponding to this.
       RecordDecl *RD = RC->getDecl();
       if (CXXRecordDecl *CRD = dyn_cast<CXXRecordDecl>(RD)) {
-        if (!CRD->isPOD())
+        if (!CRD->isPOD() && !DidWarnAboutNonPOD) {
           ExprError(Diag(BuiltinLoc, diag::warn_offsetof_non_pod_type)
             << SourceRange(CompPtr[0].LocStart, OC.LocEnd)
             << Res->getType());
+          DidWarnAboutNonPOD = true;
+        }
       }
       
       FieldDecl *MemberDecl

Modified: cfe/trunk/test/SemaCXX/offsetof.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/offsetof.cpp?rev=70637&r1=70636&r2=70637&view=diff

==============================================================================
--- cfe/trunk/test/SemaCXX/offsetof.cpp (original)
+++ cfe/trunk/test/SemaCXX/offsetof.cpp Sat May  2 13:36:10 2009
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s -Winvalid-offsetof
 
 struct NonPOD {
   virtual void f();