diff options
Diffstat (limited to 'lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 562cc5bb90..59efea0dae 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -739,11 +739,13 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) { D.isNRVOVariable(); // If this value is a POD array or struct with a statically - // determinable constant initializer, there are optimizations we - // can do. - // TODO: we can potentially constant-evaluate non-POD structs and - // arrays as long as the initialization is trivial (e.g. if they - // have a non-trivial destructor, but not a non-trivial constructor). + // determinable constant initializer, there are optimizations we can do. + // + // TODO: we should constant-evaluate any variable of literal type + // as long as it is initialized by a constant expression. Currently, + // isConstantInitializer produces wrong answers for structs with + // reference or bitfield members, and a few other cases, and checking + // for POD-ness protects us from some of these. if (D.getInit() && (Ty->isArrayType() || Ty->isRecordType()) && (Ty.isPODType(getContext()) || @@ -751,9 +753,10 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) { D.getInit()->isConstantInitializer(getContext(), false)) { // If the variable's a const type, and it's neither an NRVO - // candidate nor a __block variable, emit it as a global instead. + // candidate nor a __block variable and has no mutable members, + // emit it as a global instead. if (CGM.getCodeGenOpts().MergeAllConstants && Ty.isConstQualified() && - !NRVO && !isByRef) { + !NRVO && !isByRef && Ty->isLiteralType()) { EmitStaticVarDecl(D, llvm::GlobalValue::InternalLinkage); emission.Address = 0; // signal this condition to later callbacks |