revert r84540, fixing build breakage I didn't see because of

broken makefile deps :(


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84544 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-10-19 21:59:25 +00:00
parent 084f87d445
commit 3310a963cf
2 changed files with 7 additions and 7 deletions

View File

@ -59,7 +59,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
isImplicitlyPrivate = true; isImplicitlyPrivate = true;
SmallString<128> Name; SmallString<128> Name;
Mang.getNameWithPrefix(Name, GV, isImplicitlyPrivate); Mang->getNameWithPrefix(Name, GV, isImplicitlyPrivate);
if (getSubtarget().isTargetCygMing()) { if (getSubtarget().isTargetCygMing()) {
X86COFFMachineModuleInfo &COFFMMI = X86COFFMachineModuleInfo &COFFMMI =
@ -86,7 +86,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
const MCSymbol *&StubSym = getMachOMMI().getGVStubEntry(Sym); const MCSymbol *&StubSym = getMachOMMI().getGVStubEntry(Sym);
if (StubSym == 0) { if (StubSym == 0) {
Name.clear(); Name.clear();
Mang.getNameWithPrefix(Name, GV, false); Mang->getNameWithPrefix(Name, GV, false);
StubSym = Ctx.GetOrCreateSymbol(Name.str()); StubSym = Ctx.GetOrCreateSymbol(Name.str());
} }
return Sym; return Sym;
@ -97,7 +97,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
const MCSymbol *&StubSym = getMachOMMI().getHiddenGVStubEntry(Sym); const MCSymbol *&StubSym = getMachOMMI().getHiddenGVStubEntry(Sym);
if (StubSym == 0) { if (StubSym == 0) {
Name.clear(); Name.clear();
Mang.getNameWithPrefix(Name, GV, false); Mang->getNameWithPrefix(Name, GV, false);
StubSym = Ctx.GetOrCreateSymbol(Name.str()); StubSym = Ctx.GetOrCreateSymbol(Name.str());
} }
return Sym; return Sym;
@ -108,7 +108,7 @@ GetGlobalAddressSymbol(const MachineOperand &MO) const {
const MCSymbol *&StubSym = getMachOMMI().getFnStubEntry(Sym); const MCSymbol *&StubSym = getMachOMMI().getFnStubEntry(Sym);
if (StubSym == 0) { if (StubSym == 0) {
Name.clear(); Name.clear();
Mang.getNameWithPrefix(Name, GV, false); Mang->getNameWithPrefix(Name, GV, false);
StubSym = Ctx.GetOrCreateSymbol(Name.str()); StubSym = Ctx.GetOrCreateSymbol(Name.str());
} }
return Sym; return Sym;
@ -393,7 +393,7 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
void X86AsmPrinter::printInstructionThroughMCStreamer(const MachineInstr *MI) { void X86AsmPrinter::printInstructionThroughMCStreamer(const MachineInstr *MI) {
X86MCInstLower MCInstLowering(OutContext, *Mang, *this); X86MCInstLower MCInstLowering(OutContext, Mang, *this);
switch (MI->getOpcode()) { switch (MI->getOpcode()) {
case TargetInstrInfo::DBG_LABEL: case TargetInstrInfo::DBG_LABEL:
case TargetInstrInfo::EH_LABEL: case TargetInstrInfo::EH_LABEL:

View File

@ -27,12 +27,12 @@ namespace llvm {
/// X86MCInstLower - This class is used to lower an MachineInstr into an MCInst. /// X86MCInstLower - This class is used to lower an MachineInstr into an MCInst.
class VISIBILITY_HIDDEN X86MCInstLower { class VISIBILITY_HIDDEN X86MCInstLower {
MCContext &Ctx; MCContext &Ctx;
Mangler &Mang; Mangler *Mang;
X86AsmPrinter &AsmPrinter; X86AsmPrinter &AsmPrinter;
const X86Subtarget &getSubtarget() const; const X86Subtarget &getSubtarget() const;
public: public:
X86MCInstLower(MCContext &ctx, Mangler &mang, X86AsmPrinter &asmprinter) X86MCInstLower(MCContext &ctx, Mangler *mang, X86AsmPrinter &asmprinter)
: Ctx(ctx), Mang(mang), AsmPrinter(asmprinter) {} : Ctx(ctx), Mang(mang), AsmPrinter(asmprinter) {}
void Lower(const MachineInstr *MI, MCInst &OutMI) const; void Lower(const MachineInstr *MI, MCInst &OutMI) const;