maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Last bit by bit compatibility patch to MCDwarf.cpp: If a FDE with no LSDA is 

assigned to a CIE that requires one, just output a 0.

llvm-svn: 130472
This commit is contained in:
Rafael Espindola 2011-04-29 03:06:29 +00:00
parent 7c7151512c
commit 68067664c3
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/lib/MC/MCDwarf.cpp
View File

@ -517,7 +517,8 @@ namespace {
unsigned lsdaEncoding);
MCSymbol *EmitFDE(MCStreamer &streamer,
const MCSymbol &cieStart,
const MCDwarfFrameInfo &frame);
const MCDwarfFrameInfo &frame,
bool forceLsda);
void EmitCFIInstructions(MCStreamer &streamer,
const std::vector<MCCFIInstruction> &Instrs,
MCSymbol *BaseLabel);
@ -727,7 +728,8 @@ const MCSymbol &FrameEmitterImpl::EmitCIE(MCStreamer &streamer,
MCSymbol *FrameEmitterImpl::EmitFDE(MCStreamer &streamer,
const MCSymbol &cieStart,
const MCDwarfFrameInfo &frame) {
const MCDwarfFrameInfo &frame,
bool forceLsda) {
MCContext &context = streamer.getContext();
MCSymbol *fdeStart = context.CreateTempSymbol();
MCSymbol *fdeEnd = context.CreateTempSymbol();
@ -770,8 +772,15 @@ MCSymbol *FrameEmitterImpl::EmitFDE(MCStreamer &streamer,
// Augmentation Data
streamer.EmitLabel(augmentationStart);
// When running in "CodeGen compatibility mode" a FDE with no LSDA can be
// assigned to a CIE that requires one. In that case we output a 0 (as does
// CodeGen).
if (frame.Lsda)
EmitSymbol(streamer, *frame.Lsda, frame.LsdaEncoding);
else if (forceLsda)
streamer.EmitIntValue(0, size);
streamer.EmitLabel(augmentationEnd);
// Call Frame Instructions
@ -862,10 +871,16 @@ void MCDwarfFrameEmitter::EmitDarwin(MCStreamer &streamer) {
for (unsigned i = 0, n = streamer.getNumFrameInfos(); i < n; ++i) {
const MCDwarfFrameInfo &frame = streamer.getFrameInfo(i);
const MCSymbol *cieStart = Personalities[frame.Personality];
if (!cieStart)
bool hasLSDA;
if (!cieStart) {
cieStart = aCIE;
hasLSDA = aFrame->Lsda;
} else {
hasLSDA = true;
}
fdeEnd = Emitter.EmitFDE(streamer, *cieStart, frame);
fdeEnd = Emitter.EmitFDE(streamer, *cieStart, frame,
hasLSDA);
if (i != n - 1)
streamer.EmitLabel(fdeEnd);
}
@ -898,7 +913,7 @@ void MCDwarfFrameEmitter::Emit(MCStreamer &streamer) {
cieStart = &Emitter.EmitCIE(streamer, frame.Personality,
frame.PersonalityEncoding, frame.Lsda,
frame.LsdaEncoding);
fdeEnd = Emitter.EmitFDE(streamer, *cieStart, frame);
fdeEnd = Emitter.EmitFDE(streamer, *cieStart, frame, false);
if (i != n - 1)
streamer.EmitLabel(fdeEnd);
}