RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 20:23:11 +01:00
Code Issues Projects Releases Wiki Activity

Move the EH symbol to the asm printer and use it for the SJLJ case too.

Browse Source 
llvm-svn: 232475
This commit is contained in:
Rafael Espindola 2015-03-17 13:57:48 +00:00
parent 91800b3b52
commit 205b5558af
9 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/CodeGen/AsmPrinter.h
View File

@ -108,6 +108,7 @@ public:
private:
MCSymbol *CurrentFnBegin;
MCSymbol *CurrentFnEnd;
MCSymbol *CurExceptionSym;
// The garbage collection metadata printer table.
void *GCMetadataPrinters; // Really a DenseMap.
@ -154,6 +155,7 @@ public:
MCSymbol *getFunctionBegin() const { return CurrentFnBegin; }
MCSymbol *getFunctionEnd() const { return CurrentFnEnd; }
MCSymbol *getCurExceptionSym();
/// Return information about object file lowering.
const TargetLoweringObjectFile &getObjFileLowering() const;

2
lib/CodeGen/AsmPrinter/ARMException.cpp
View File

@ -53,8 +53,6 @@ void ARMException::endModule() {
}
void ARMException::beginFunction(const MachineFunction *MF) {
DwarfCFIExceptionBase::beginFunction(MF);
if (Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)
getTargetStreamer().emitFnStart();
// See if we need call frame info.

9
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -108,7 +108,7 @@ AsmPrinter::AsmPrinter(TargetMachine &tm, std::unique_ptr<MCStreamer> Streamer)
MMI = nullptr;
LI = nullptr;
MF = nullptr;
CurrentFnSym = CurrentFnSymForSize = nullptr;
CurExceptionSym = CurrentFnSym = CurrentFnSymForSize = nullptr;
CurrentFnBegin = nullptr;
CurrentFnEnd = nullptr;
GCMetadataPrinters = nullptr;
@ -1129,12 +1129,19 @@ bool AsmPrinter::doFinalization(Module &M) {
return false;
}
MCSymbol *AsmPrinter::getCurExceptionSym() {
if (!CurExceptionSym)
CurExceptionSym = createTempSymbol("exception", getFunctionNumber());
return CurExceptionSym;
}
void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
this->MF = &MF;
// Get the function symbol.
CurrentFnSym = getSymbol(MF.getFunction());
CurrentFnSymForSize = CurrentFnSym;
CurrentFnBegin = nullptr;
CurExceptionSym = nullptr;
bool NeedsLocalForSize = MAI->needsLocalForSize();
if (!MMI->getLandingPads().empty() || MMI->hasDebugInfo() ||
NeedsLocalForSize) {

4
lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
View File

@ -88,8 +88,6 @@ void DwarfCFIException::endModule() {
}
void DwarfCFIException::beginFunction(const MachineFunction *MF) {
DwarfCFIExceptionBase::beginFunction(MF);
shouldEmitMoves = shouldEmitPersonality = shouldEmitLSDA = false;
// If any landing pads survive, we need an EH table.
@ -133,7 +131,7 @@ void DwarfCFIException::beginFunction(const MachineFunction *MF) {
if (!shouldEmitLSDA)
return;
Asm->OutStreamer.EmitCFILsda(getCurExceptionSym(), LSDAEncoding);
Asm->OutStreamer.EmitCFILsda(Asm->getCurExceptionSym(), LSDAEncoding);
}
/// endFunction - Gather and emit post-function exception information.

20
lib/CodeGen/AsmPrinter/EHStreamer.cpp
View File

@ -25,22 +25,10 @@
using namespace llvm;
EHStreamer::EHStreamer(AsmPrinter *A)
: CurExceptionSym(nullptr), Asm(A), MMI(Asm->MMI) {}
EHStreamer::EHStreamer(AsmPrinter *A) : Asm(A), MMI(Asm->MMI) {}
EHStreamer::~EHStreamer() {}
MCSymbol *EHStreamer::getCurExceptionSym() {
if (!CurExceptionSym)
CurExceptionSym = Asm->OutContext.createTempSymbol(
"exception" + Twine(Asm->getFunctionNumber()));
return CurExceptionSym;
}
void EHStreamer::beginFunction(const MachineFunction *MF) {
CurExceptionSym = nullptr;
}
/// How many leading type ids two landing pads have in common.
unsigned EHStreamer::sharedTypeIDs(const LandingPadInfo *L,
const LandingPadInfo *R) {
@ -448,11 +436,7 @@ void EHStreamer::emitExceptionTable() {
Asm->OutContext.GetOrCreateSymbol(Twine("GCC_except_table")+
Twine(Asm->getFunctionNumber()));
Asm->OutStreamer.EmitLabel(GCCETSym);
Asm->OutStreamer.EmitLabel(getCurExceptionSym());
if (IsSJLJ)
Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("_LSDA_",
Asm->getFunctionNumber()));
Asm->OutStreamer.EmitLabel(Asm->getCurExceptionSym());
// Emit the LSDA header.
Asm->EmitEncodingByte(dwarf::DW_EH_PE_omit, "@LPStart");

5
lib/CodeGen/AsmPrinter/EHStreamer.h
View File

@ -31,8 +31,6 @@ class SmallVectorImpl;
/// Emits exception handling directives.
class EHStreamer : public AsmPrinterHandler {
MCSymbol *CurExceptionSym;
protected:
/// Target of directive emission.
AsmPrinter *Asm;
@ -127,9 +125,6 @@ public:
EHStreamer(AsmPrinter *A);
virtual ~EHStreamer();
MCSymbol *getCurExceptionSym();
void beginFunction(const MachineFunction *MF) override;
// Unused.
void setSymbolSize(const MCSymbol *Sym, uint64_t Size) override {}
void beginInstruction(const MachineInstr *MI) override {}

2
lib/CodeGen/AsmPrinter/Win64Exception.cpp
View File

@ -49,8 +49,6 @@ void Win64Exception::endModule() {
}
void Win64Exception::beginFunction(const MachineFunction *MF) {
EHStreamer::beginFunction(MF);
shouldEmitMoves = shouldEmitPersonality = shouldEmitLSDA = false;
// If any landing pads survive, we need an EH table.

5
lib/Target/ARM/ARMAsmPrinter.cpp
View File

@ -960,10 +960,7 @@ EmitMachineConstantPoolValue(MachineConstantPoolValue *MCPV) {
MCSymbol *MCSym;
if (ACPV->isLSDA()) {
SmallString<128> Str;
raw_svector_ostream OS(Str);
OS << DL->getPrivateGlobalPrefix() << "_LSDA_" << getFunctionNumber();
MCSym = OutContext.GetOrCreateSymbol(OS.str());
MCSym = getCurExceptionSym();
} else if (ACPV->isBlockAddress()) {
const BlockAddress *BA =
cast<ARMConstantPoolConstant>(ACPV)->getBlockAddress();

6
test/CodeGen/ARM/2009-08-31-LSDA-Name.ll
View File

@ -1,7 +1,9 @@
; RUN: llc < %s -mtriple=arm-apple-darwin9 -march=arm | FileCheck %s
; CHECK: L_LSDA_0:
; CHECK: .cfi_lsda 16, [[LABEL:.*]]
; CHECK: .long [[LABEL]]-
; CHECK: [[LABEL]]:
; CHECK: .byte 255 @ @LPStart Encoding = omit
%struct.A = type { i32* }