RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix a crash when writing merged bitcode.

Browse Source 
Playing with mutateType in here was making getValueType and getType
incompatible.

llvm-svn: 254240
This commit is contained in:
Rafael Espindola 2015-11-29 03:21:30 +00:00
parent b0e9d52803
commit cff4b2f76a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Linker/LinkModules.cpp
View File

@ -537,7 +537,7 @@ private:
bool linkGlobalValueProto(GlobalValue *GV);
bool linkModuleFlagsMetadata();
void linkAppendingVarInit(const AppendingVarInfo &AVI);
void linkAppendingVarInit(AppendingVarInfo &AVI);
void linkGlobalInit(GlobalVariable &Dst, GlobalVariable &Src);
bool linkFunctionBody(Function &Dst, Function &Src);
@ -1493,7 +1493,7 @@ static void getArrayElements(const Constant *C,
Dest.push_back(C->getAggregateElement(i));
}
void ModuleLinker::linkAppendingVarInit(const AppendingVarInfo &AVI) {
void ModuleLinker::linkAppendingVarInit(AppendingVarInfo &AVI) {
// Merge the initializer.
SmallVector<Constant *, 16> DstElements;
getArrayElements(AVI.DstInit, DstElements);
@ -1517,9 +1517,18 @@ void ModuleLinker::linkAppendingVarInit(const AppendingVarInfo &AVI) {
DstElements.push_back(
MapValue(V, ValueMap, RF_MoveDistinctMDs, &TypeMap, &ValMaterializer));
}
if (IsNewStructor) {
if (DstElements.size() != NewType->getNumElements()) {
NewType = ArrayType::get(NewType->getElementType(), DstElements.size());
AVI.NewGV->mutateType(PointerType::get(NewType, 0));
GlobalVariable *Old = AVI.NewGV;
GlobalVariable *NG = new GlobalVariable(
*DstM, NewType, Old->isConstant(), Old->getLinkage(), /*init*/ nullptr,
/*name*/ "", Old, Old->getThreadLocalMode(),
Old->getType()->getAddressSpace());
copyGVAttributes(NG, Old);
AVI.NewGV->replaceAllUsesWith(
ConstantExpr::getBitCast(NG, AVI.NewGV->getType()));
AVI.NewGV->eraseFromParent();
AVI.NewGV = NG;
}
AVI.NewGV->setInitializer(ConstantArray::get(NewType, DstElements));
@ -1909,7 +1918,7 @@ bool ModuleLinker::run() {
if (linkGlobalValueProto(&GA))
return true;
for (const AppendingVarInfo &AppendingVar : AppendingVars)
for (AppendingVarInfo &AppendingVar : AppendingVars)
linkAppendingVarInit(AppendingVar);
for (const auto &Entry : DstM->getComdatSymbolTable()) {

3
test/Linker/ctors.ll
View File

@ -3,6 +3,9 @@
; RUN: llvm-link %p/Inputs/ctors.ll %s -S -o - | \
; RUN: FileCheck --check-prefix=ALL --check-prefix=CHECK2 %s
; Test the bitcode writer too. It used to crash.
; RUN: llvm-link %s %p/Inputs/ctors.ll -o t.bc
@v = weak global i8 0
; CHECK1: @v = weak global i8 0
; CHECK2: @v = weak global i8 1