aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGExprConstant.cpp
diff options
context:
space:
mode:
authorJin-Gu Kang <jaykang10@imrc.kist.re.kr>2012-09-05 08:37:43 +0000
committerJin-Gu Kang <jaykang10@imrc.kist.re.kr>2012-09-05 08:37:43 +0000
commit45e4e086cf7b4552e806669825f5b2aa2368cc36 (patch)
tree88be13e2ccf08f1a16b3080d6b8e57d679279eec /lib/CodeGen/CGExprConstant.cpp
parent8cdd8a9f19146582aeadae3fe38ae21ffbe3deeb (diff)
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
Diffstat (limited to 'lib/CodeGen/CGExprConstant.cpp')
-rw-r--r--lib/CodeGen/CGExprConstant.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 8a2a586fa4..6aa9a8a6d9 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -830,12 +830,12 @@ public:
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;
}