commit 31e984debf93b35519d5ae9a5d19e33277ae8346
author Eli Friedman <eli.friedman@gmail.com> Fri Jun 06 20:12:37 2008 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri Jun 06 20:12:37 2008 +0000
tree c2a5aadba4c059238eceb9bca7d8112b29e14bd4
parent ff29162389e64413aafc9e6d92faa2c2b9cf5591

Reorganize this loop a bit so it doesn't crash for empty unions.  Fixes 
PR2419.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52060 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprConstant.cpp

diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 58b1884..f597772 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -213,13 +213,15 @@
 
     // Find the field decl we're initializing, if any
     int FieldNo = 0; // Field no in RecordDecl
-    FieldDecl* curField;
-    do {
+    FieldDecl* curField = 0;
+    while (FieldNo < RD->getNumMembers()) {
       curField = RD->getMember(FieldNo);
       FieldNo++;
-    } while (!curField->getIdentifier() && FieldNo < RD->getNumMembers());
+      if (curField->getIdentifier())
+        break;
+    }
 
-    if (ILE->getNumInits() == 0 || !curField->getIdentifier())
+    if (!curField || !curField->getIdentifier() || ILE->getNumInits() == 0)
       return llvm::Constant::getNullValue(Ty);
 
     if (curField->isBitField()) {