summaryrefslogtreecommitdiffstats
path: root/clang/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
commit1a5e423602a973b1b5fc3af0e948b692fa4c18e5 (patch)
tree1f7d96549aac32a080a9422eb47b137909353933 /clang/lib/CodeGen/CGExprConstant.cpp
parentab2c76711d61ac66f09134fe5de2a3d2d30b1008 (diff)
downloadbcm5719-llvm-1a5e423602a973b1b5fc3af0e948b692fa4c18e5.tar.gz
bcm5719-llvm-1a5e423602a973b1b5fc3af0e948b692fa4c18e5.zip
Changing of type checking order on InitListExpr
- UnionType is checked eariler than RecordType. llvm-svn: 163202
Diffstat (limited to 'clang/lib/CodeGen/CGExprConstant.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprConstant.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index 8a2a586fa4a..6aa9a8a6d96 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/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;
}
OpenPOWER on IntegriCloud