6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-06-30 23:30:28 +00:00
Code Issues Projects Releases Wiki Activity

AsmParser: Reject invalid mismatch between forward ref and def

Browse Source 
Don't assume that the forward referenced entity was of the same
global-kind as the new entity.

This fixes PR21779.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223754 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2014-12-09 05:43:56 +00:00
parent 13dd854d8c
commit 82258b45e4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AsmParser/LLParser.cpp
View File

@ -787,33 +787,36 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc,
if (Ty->isFunctionTy() || Ty->isLabelTy()) if (Ty->isFunctionTy() || Ty->isLabelTy())
return Error(TyLoc, "invalid type for global variable"); return Error(TyLoc, "invalid type for global variable");
GlobalVariable *GV = nullptr; GlobalValue *GVal = nullptr;
// See if the global was forward referenced, if so, use the global. // See if the global was forward referenced, if so, use the global.
if (!Name.empty()) { if (!Name.empty()) {
if (GlobalValue *GVal = M->getNamedValue(Name)) { GVal = M->getNamedValue(Name);
if (GVal) {
if (!ForwardRefVals.erase(Name) || !isa<GlobalValue>(GVal)) if (!ForwardRefVals.erase(Name) || !isa<GlobalValue>(GVal))
return Error(NameLoc, "redefinition of global '@" + Name + "'"); return Error(NameLoc, "redefinition of global '@" + Name + "'");
GV = cast<GlobalVariable>(GVal);
} }
} else { } else {
std::map<unsigned, std::pair<GlobalValue*, LocTy> >::iterator std::map<unsigned, std::pair<GlobalValue*, LocTy> >::iterator
I = ForwardRefValIDs.find(NumberedVals.size()); I = ForwardRefValIDs.find(NumberedVals.size());
if (I != ForwardRefValIDs.end()) { if (I != ForwardRefValIDs.end()) {
GV = cast<GlobalVariable>(I->second.first); GVal = I->second.first;
ForwardRefValIDs.erase(I); ForwardRefValIDs.erase(I);
} }
} }
GlobalVariable *GV;
if (!GV) { if (!GV) {
GV = new GlobalVariable(*M, Ty, false, GlobalValue::ExternalLinkage, nullptr, GV = new GlobalVariable(*M, Ty, false, GlobalValue::ExternalLinkage, nullptr,
Name, nullptr, GlobalVariable::NotThreadLocal, Name, nullptr, GlobalVariable::NotThreadLocal,
AddrSpace); AddrSpace);
} else { } else {
if (GV->getType()->getElementType() != Ty) if (GVal->getType()->getElementType() != Ty)
return Error(TyLoc, return Error(TyLoc,
"forward reference and definition of global have different types"); "forward reference and definition of global have different types");
GV = cast<GlobalVariable>(GVal);
// Move the forward-reference to the correct spot in the module. // Move the forward-reference to the correct spot in the module.
M->getGlobalList().splice(M->global_end(), M->getGlobalList(), GV); M->getGlobalList().splice(M->global_end(), M->getGlobalList(), GV);
} }

4
test/Assembler/invalid-fwdref2.ll Normal file
View File

@ -0,0 +1,4 @@
; RUN: not llvm-as %s -disable-output 2>&1 | grep "forward reference and definition of global have different types"
@a2 = alias void ()* @g2
@g2 = internal global i8 42