remove uses of deprecated functions, this generates slightly

different BlockAddress labels, but nothing semantically important.

Add a FIXME that BlockAddress codegen is broken if the LLVM BB has 
an empty name (e.g. strip was run).


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93303 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-01-13 07:30:49 +00:00
parent dfbcb8c38b
commit 2f8cc26be4
3 changed files with 14 additions and 13 deletions

View File

@ -1677,14 +1677,15 @@ MCSymbol *AsmPrinter::GetBlockAddressSymbol(const Function *F,
// This code must use the function name itself, and not the function number,
// since it must be possible to generate the label name from within other
// functions.
std::string FuncName = Mang->getMangledName(F);
SmallString<60> FnName;
Mang->getNameWithPrefix(FnName, F, false);
// FIXME: THIS IS BROKEN IF THE LLVM BASIC BLOCK DOESN'T HAVE A NAME!
SmallString<60> NameResult;
raw_svector_ostream(NameResult) << MAI->getPrivateGlobalPrefix() << "BA"
<< FuncName.size() << '_' << FuncName << '_';
Mang->getNameWithPrefix(NameResult, BB->getName());
if (Suffix[0])
NameResult += Suffix;
Mang->getNameWithPrefix(NameResult,
StringRef("BA") + Twine((unsigned)FnName.size()) +
"_" + FnName.str() + "_" + BB->getName() + Suffix,
Mangler::Private);
return OutContext.GetOrCreateSymbol(NameResult.str());
}

View File

@ -55,6 +55,6 @@ L1: ; preds = %L2, %bb2
store i8* blockaddress(@foo, %L5), i8** @nextaddr, align 4
ret i32 %res.3
}
; ARM: .long LBA4__foo__L5-(LPC{{.*}}+8)
; THUMB: .long LBA4__foo__L5-(LPC{{.*}}+4)
; THUMB2: .long LBA4__foo__L5
; ARM: .long L_BA4__foo_L5-(LPC{{.*}}+8)
; THUMB: .long L_BA4__foo_L5-(LPC{{.*}}+4)
; THUMB2: .long L_BA4__foo_L5

View File

@ -43,12 +43,12 @@ L2: ; preds = %L3, %bb2
L1: ; preds = %L2, %bb2
%res.3 = phi i32 [ %phitmp, %L2 ], [ 2, %bb2 ] ; <i32> [#uses=1]
; PIC: addis r4, r2, ha16(LBA4__foo__L5-"L1$pb")
; PIC: li r5, lo16(LBA4__foo__L5-"L1$pb")
; PIC: addis r4, r2, ha16(L_BA4__foo_L5-"L1$pb")
; PIC: li r5, lo16(L_BA4__foo_L5-"L1$pb")
; PIC: add r4, r4, r5
; PIC: stw r4
; STATIC: li r2, lo16(LBA4__foo__L5)
; STATIC: addis r2, r2, ha16(LBA4__foo__L5)
; STATIC: li r2, lo16(L_BA4__foo_L5)
; STATIC: addis r2, r2, ha16(L_BA4__foo_L5)
; STATIC: stw r2
store i8* blockaddress(@foo, %L5), i8** @nextaddr, align 4
ret i32 %res.3