commit 45e4e086cf7b4552e806669825f5b2aa2368cc36
author Jin-Gu Kang <jaykang10@imrc.kist.re.kr> Wed Sep 05 08:37:43 2012 +0000
committer Jin-Gu Kang <jaykang10@imrc.kist.re.kr> Wed Sep 05 08:37:43 2012 +0000
tree 88be13e2ccf08f1a16b3080d6b8e57d679279eec
parent 8cdd8a9f19146582aeadae3fe38ae21ffbe3deeb

Changing of type checking order on InitListExpr
- UnionType is checked eariler than RecordType.


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

lib/CodeGen/CGExprConstant.cpp

diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 8a2a586..6aa9a8a 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -830,12 +830,12 @@
     if (ILE->getType()->isArrayType())
       return EmitArrayInitialization(ILE);
 
-    if (ILE->getType()->isRecordType())
-      return EmitStructInitialization(ILE);
-
     if (ILE->getType()->isUnionType())
       return EmitUnionInitialization(ILE);
 
+    if (ILE->getType()->isRecordType())
+      return EmitStructInitialization(ILE);
+
     return 0;
   }