nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for PR5714: make sure globals that will be modified aren't marked const.

Browse Source 
llvm-svn: 91156
This commit is contained in:
Eli Friedman
2009-12-11 21:23:03 +00:00
parent 4dab76a752
commit b095e15af4
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -760,6 +760,17 @@ CodeGenModule::CreateRuntimeFunction(const llvm::FunctionType *FTy,
return GetOrCreateLLVMFunction(Name, FTy, GlobalDecl());
}
static bool DeclIsConstantGlobal(ASTContext &Context, const VarDecl *D) {
if (!D->getType().isConstant(Context))
return false;
if (Context.getLangOptions().CPlusPlus &&
Context.getBaseElementType(D->getType())->getAs<RecordType>()) {
// FIXME: We should do something fancier here!
return false;
}
return true;
}
/// GetOrCreateLLVMGlobal - If the specified mangled name is not in the module,
/// create and return an llvm GlobalVariable with the specified type. If there
/// is something in the module with the specified name, return it potentially
@@ -803,7 +814,7 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMGlobal(const char *MangledName,
if (D) {
// FIXME: This code is overly simple and should be merged with other global
// handling.
GV->setConstant(D->getType().isConstant(Context));
GV->setConstant(DeclIsConstantGlobal(Context, D));
// FIXME: Merge with other attribute handling code.
if (D->getStorageClass() == VarDecl::PrivateExtern)
@@ -978,11 +989,8 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) {
// If it is safe to mark the global 'constant', do so now.
GV->setConstant(false);
if (D->getType().isConstant(Context)) {
// FIXME: In C++, if the variable has a non-trivial ctor/dtor or any mutable
// members, it cannot be declared "LLVM const".
if (DeclIsConstantGlobal(Context, D))
GV->setConstant(true);
}
GV->setAlignment(getContext().getDeclAlignInBytes(D));