[cfe-commits] r66214 - /cfe/trunk/lib/Sema/SemaDeclCXX.cpp

[Chris Lattner]

Author: lattner
Date: Thu Mar  5 17:03:49 2009
New Revision: 66214

URL: http://llvm.org/viewvc/llvm-project?rev=66214&view=rev
Log:
more minor simplifications.

Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Thu Mar  5 17:03:49 2009
@@ -546,13 +546,14 @@
 
   Decl *Member;
   if (isInstField) {
-    FieldDecl *FD = 
-      HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D, BitWidth);
-    // Refresh our notion of bitwidth.
-    BitWidth = FD->getBitWidth();
-    Member = FD;
+    Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D, BitWidth);
+    assert(Member && "HandleField never returns null");
   } else {
     Member = static_cast<Decl*>(ActOnDeclarator(S, D, LastInGroup));
+    if (!Member) {
+      if (BitWidth) DeleteExpr(BitWidth);
+      return LastInGroup;
+    }
 
     // Non-instance-fields can't have a bitfield.
     if (BitWidth) {
@@ -580,8 +581,6 @@
     }
   }
 
-  if (!Member) return LastInGroup;
-
   assert((Name || isInstField) && "No identifier for non-field ?");
 
   // set/getAccess is not part of Decl's interface to avoid bloating it with C++