6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-25 00:24:26 +00:00
Code Issues Projects Releases Wiki Activity

Revert 85678/85680. The decision is to stay with the current form of

Browse Source 
indirectbr, thus we don't need "blockaddr(@func, null)".  Eliminate it
for simplicity.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85699 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-11-01 01:27:45 +00:00
parent de17fb6e4d
commit cdfc940912
11 changed files with 25 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AsmParser/LLParser.cpp
View File

@ -123,25 +123,20 @@ bool LLParser::ResolveForwardRefBlockAddresses(Function *TheFn,
// Loop over all the references, resolving them.
for (unsigned i = 0, e = Refs.size(); i != e; ++i) {
BasicBlock *Res;
if (Refs[i].first.Kind == ValID::t_Null)
Res = 0;
else if (PFS) {
if (PFS) {
if (Refs[i].first.Kind == ValID::t_LocalName)
Res = PFS->GetBB(Refs[i].first.StrVal, Refs[i].first.Loc);
else {
assert(Refs[i].first.Kind == ValID::t_LocalID);
else
Res = PFS->GetBB(Refs[i].first.UIntVal, Refs[i].first.Loc);
}
} else if (Refs[i].first.Kind == ValID::t_LocalID) {
return Error(Refs[i].first.Loc,
"cannot take address of numeric label after it the function is defined");
} else {
assert(Refs[i].first.Kind == ValID::t_LocalName);
Res = dyn_cast_or_null<BasicBlock>(
TheFn->getValueSymbolTable().lookup(Refs[i].first.StrVal));
}
if (Res == 0 && Refs[i].first.Kind != ValID::t_Null)
if (Res == 0)
return Error(Refs[i].first.Loc,
"referenced value is not a basic block");
@ -2060,11 +2055,10 @@ bool LLParser::ParseValID(ValID &ID) {
ParseValID(Label) ||
ParseToken(lltok::rparen, "expected ')' in block address expression"))
return true;
if (Fn.Kind != ValID::t_GlobalID && Fn.Kind != ValID::t_GlobalName)
return Error(Fn.Loc, "expected function name in blockaddress");
if (Label.Kind != ValID::t_LocalID && Label.Kind != ValID::t_LocalName &&
Label.Kind != ValID::t_Null)
if (Label.Kind != ValID::t_LocalID && Label.Kind != ValID::t_LocalName)
return Error(Label.Loc, "expected basic block name in blockaddress");
// Make a global variable as a placeholder for this reference.