summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2012-02-27 23:20:01 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2012-02-27 23:20:01 +0000
commit062a82cdfab01d95f7fa3d759342e6f2ee5c51b0 (patch)
tree0bd386014c282947f23b612de02bc33624de2bac /lib
parentc1b66e6003262b284937b542aa159a0c79619ff4 (diff)
downloadclang-062a82cdfab01d95f7fa3d759342e6f2ee5c51b0.tar.gz
clang-062a82cdfab01d95f7fa3d759342e6f2ee5c51b0.tar.bz2
clang-062a82cdfab01d95f7fa3d759342e6f2ee5c51b0.tar.xz
Hack in a loud error for PR12086. Better than a silent miscompile.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151586 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/CodeGenModule.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index ddd04a427c..a3a71b7e52 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1376,8 +1376,19 @@ CodeGenModule::MaybeEmitGlobalStdInitializerListInitializer(const VarDecl *D,
return 0;
ASTContext &ctx = getContext();
- // Synthesize a fake VarDecl for the array and initialize that.
unsigned numInits = init->getNumInits();
+ // FIXME: This check is here because we would otherwise silently miscompile
+ // nested global std::initializer_lists. Better would be to have a real
+ // implementation.
+ for (unsigned i = 0; i < numInits; ++i) {
+ const InitListExpr *inner = dyn_cast<InitListExpr>(init->getInit(i));
+ if (inner && inner->initializesStdInitializerList()) {
+ ErrorUnsupported(inner, "nested global std::initializer_list");
+ return 0;
+ }
+ }
+
+ // Synthesize a fake VarDecl for the array and initialize that.
QualType elementType = init->getInit(0)->getType();
llvm::APInt numElements(ctx.getTypeSize(ctx.getSizeType()), numInits);
QualType arrayType = ctx.getConstantArrayType(elementType, numElements,