diff options
author | Chris Lattner <sabre@nondot.org> | 2010-03-14 02:33:54 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-03-14 02:33:54 +0000 |
commit | ee2fbbc978aa29a0196ea522adb947a8f86dde4a (patch) | |
tree | b2ceb0047581b28bbf89d16f9329e0401478244e /llvm/lib/Target | |
parent | 07293da97ebf4028f95ba0b9c0a6f200b4c03ebc (diff) | |
download | bcm5719-llvm-ee2fbbc978aa29a0196ea522adb947a8f86dde4a.tar.gz bcm5719-llvm-ee2fbbc978aa29a0196ea522adb947a8f86dde4a.zip |
change the LabelSDNode to be EHLabelSDNode and make it hold
an MCSymbol. Make the EH_LABEL MachineInstr hold its label
with an MCSymbol instead of ID. Fix a bug in MMI.cpp which
would return labels named "Label4" instead of "label4".
llvm-svn: 98463
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r-- | llvm/lib/Target/ARM/ARMCodeEmitter.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Target/X86/X86CodeEmitter.cpp | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMCodeEmitter.cpp b/llvm/lib/Target/ARM/ARMCodeEmitter.cpp index f7e5e4ed80e..e3b1dda39c9 100644 --- a/llvm/lib/Target/ARM/ARMCodeEmitter.cpp +++ b/llvm/lib/Target/ARM/ARMCodeEmitter.cpp @@ -564,9 +564,11 @@ void ARMCodeEmitter::emitPseudoInstruction(const MachineInstr &MI) { break; } case TargetOpcode::DBG_LABEL: - case TargetOpcode::EH_LABEL: MCE.emitLabel(MMI->getLabelSym(MI.getOperand(0).getImm())); break; + case TargetOpcode::EH_LABEL: + MCE.emitLabel(MI.getOperand(0).getMCSymbol()); + break; case TargetOpcode::IMPLICIT_DEF: case TargetOpcode::KILL: // Do nothing. diff --git a/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp b/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp index 3d8daf7586d..6c4cf800a55 100644 --- a/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp +++ b/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp @@ -111,9 +111,11 @@ void PPCCodeEmitter::emitBasicBlock(MachineBasicBlock &MBB) { MCE.emitWordBE(getBinaryCodeForInstr(MI)); break; case TargetOpcode::DBG_LABEL: - case TargetOpcode::EH_LABEL: MCE.emitLabel(MMI->getLabelSym(MI.getOperand(0).getImm())); break; + case TargetOpcode::EH_LABEL: + MCE.emitLabel(MI.getOperand(0).getMCSymbol()); + break; case TargetOpcode::IMPLICIT_DEF: case TargetOpcode::KILL: break; // pseudo opcode, no side effects diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp index 2267752a5bd..d5ecd3b72e8 100644 --- a/llvm/lib/Target/X86/X86CodeEmitter.cpp +++ b/llvm/lib/Target/X86/X86CodeEmitter.cpp @@ -603,10 +603,13 @@ void Emitter<CodeEmitter>::emitInstruction(const MachineInstr &MI, llvm_report_error("JIT does not support inline asm!"); break; case TargetOpcode::DBG_LABEL: - case TargetOpcode::EH_LABEL: case TargetOpcode::GC_LABEL: MCE.emitLabel(MMI->getLabelSym(MI.getOperand(0).getImm())); break; + case TargetOpcode::EH_LABEL: + MCE.emitLabel(MI.getOperand(0).getMCSymbol()); + break; + case TargetOpcode::IMPLICIT_DEF: case TargetOpcode::KILL: case X86::FP_REG_KILL: |