6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-05 17:39:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix the merging of the constantness of declarations.

Browse Source 
The langref says:

LLVM explicitly allows declarations of global variables to be marked
constant, even if the final definition of the global is not. This
capability can be used to enable slightly better optimization of the
program, but requires the language definition to guarantee that
optimizations based on the ‘constantness’ are valid for the
translation units that do not include the definition.

Given that definition, when merging two declarations, we have to drop
constantness if of of them is not marked contant, since the Module
without the constant marker might not have the necessary guarantees.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220927 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-10-30 20:50:23 +00:00
parent d33e67757e
commit 3d41cbb3f4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Linker/LinkModules.cpp
View File

@ -1052,9 +1052,8 @@ bool ModuleLinker::linkGlobalProto(GlobalVariable *SGV) {
if (GlobalVariable *DGVar = dyn_cast<GlobalVariable>(DGV)) {
DGVar->setAlignment(Alignment);
if (DGVar->isDeclaration() && SGV->isConstant() &&
!DGVar->isConstant())
DGVar->setConstant(true);
if (DGVar->isDeclaration() && !SGV->isConstant())
DGVar->setConstant(false);
}
// Set calculated linkage, visibility and unnamed_addr.

2
test/Linker/ConstantGlobals3.ll
View File

@ -1,6 +1,6 @@
; RUN: llvm-link %s %S/Inputs/ConstantGlobals3.ll -S | FileCheck %s
; RUN: llvm-link %S/Inputs/ConstantGlobals3.ll %s -S | FileCheck %s
; CHECK: @X = external constant [1 x i32]
; CHECK: @X = external global [1 x i32]
@X = external global [1 x i32]