From f754f50805fee2bb4d461a9b41107122a22cd6f6 Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Fri, 25 Feb 2011 16:30:32 +0000 Subject: [PATCH] Roll out r126425 and r126450 to see if it fixes the failures on the buildbots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126488 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCStreamer.h | 5 ---- lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp | 5 ++-- lib/CodeGen/AsmPrinter/DIE.cpp | 23 ----------------- lib/CodeGen/AsmPrinter/DIE.h | 30 ---------------------- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 13 ++-------- lib/CodeGen/AsmPrinter/DwarfDebug.h | 6 ----- lib/MC/MCAsmInfoCOFF.cpp | 1 - lib/MC/MCAsmStreamer.cpp | 6 ----- lib/MC/MCELFStreamer.cpp | 4 --- lib/MC/MCLoggingStreamer.cpp | 5 ---- lib/MC/MCMachOStreamer.cpp | 3 --- lib/MC/MCNullStreamer.cpp | 1 - lib/MC/MCPureStreamer.cpp | 3 --- lib/MC/WinCOFFObjectWriter.cpp | 4 --- lib/MC/WinCOFFStreamer.cpp | 18 ------------- lib/Target/PTX/PTXMCAsmStreamer.cpp | 3 --- lib/Target/X86/X86AsmBackend.cpp | 4 +-- lib/Target/X86/X86FixupKinds.h | 2 -- lib/Target/X86/X86MCAsmInfo.cpp | 3 --- 19 files changed, 6 insertions(+), 133 deletions(-) diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h index c5bc947b960..4451199b7fb 100644 --- a/include/llvm/MC/MCStreamer.h +++ b/include/llvm/MC/MCStreamer.h @@ -239,11 +239,6 @@ namespace llvm { /// EndCOFFSymbolDef - Marks the end of the symbol definition. virtual void EndCOFFSymbolDef() = 0; - /// EmitCOFFSecRel32 - Emits a COFF section relative relocation. - /// - /// @param Symbol - Symbol the section relative realocation should point to. - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) = 0; - /// EmitELFSize - Emit an ELF .size directive. /// /// This corresponds to an assembler statement such as: diff --git a/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp b/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp index e7418d294b1..98a1bf2f1ce 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp @@ -177,8 +177,9 @@ void AsmPrinter::EmitReference(const GlobalValue *GV, unsigned Encoding)const{ void AsmPrinter::EmitSectionOffset(const MCSymbol *Label, const MCSymbol *SectionLabel) const { // On COFF targets, we have to emit the special .secrel32 directive. - if (MAI->getDwarfSectionOffsetDirective()) { - OutStreamer.EmitCOFFSecRel32(Label); + if (const char *SecOffDir = MAI->getDwarfSectionOffsetDirective()) { + // FIXME: MCize. + OutStreamer.EmitRawText(SecOffDir + Twine(Label->getName())); return; } diff --git a/lib/CodeGen/AsmPrinter/DIE.cpp b/lib/CodeGen/AsmPrinter/DIE.cpp index ff3c6da084b..21396ca37f0 100644 --- a/lib/CodeGen/AsmPrinter/DIE.cpp +++ b/lib/CodeGen/AsmPrinter/DIE.cpp @@ -276,29 +276,6 @@ void DIELabel::print(raw_ostream &O) { } #endif -//===----------------------------------------------------------------------===// -// DIESectionOffset Implementation -//===----------------------------------------------------------------------===// - -/// EmitValue - Emit label value. -/// -void DIESectionOffset::EmitValue(AsmPrinter *AP, unsigned Form) const { - AP->EmitSectionOffset (Label, Label); -} - -/// SizeOf - Determine size of label value in bytes. -/// -unsigned DIESectionOffset::SizeOf(AsmPrinter *AP, unsigned Form) const { - if (Form == dwarf::DW_FORM_data4) return 4; - return AP->getTargetData().getPointerSize(); -} - -#ifndef NDEBUG -void DIESectionOffset::print(raw_ostream &O) { - O << "SecRelLbl: " << Label->getName(); -} -#endif - //===----------------------------------------------------------------------===// // DIEDelta Implementation //===----------------------------------------------------------------------===// diff --git a/lib/CodeGen/AsmPrinter/DIE.h b/lib/CodeGen/AsmPrinter/DIE.h index bf5768a4361..d56c0947795 100644 --- a/lib/CodeGen/AsmPrinter/DIE.h +++ b/lib/CodeGen/AsmPrinter/DIE.h @@ -327,36 +327,6 @@ namespace llvm { static bool classof(const DIELabel *) { return true; } static bool classof(const DIEValue *L) { return L->getType() == isLabel; } -#ifndef NDEBUG - virtual void print(raw_ostream &O); -#endif - }; - - //===--------------------------------------------------------------------===// - /// DIESectionOffset - A section relative label expression DIE. - // - class DIESectionOffset : public DIEValue { - const MCSymbol *Label; - public: - explicit DIESectionOffset(const MCSymbol *L) : DIEValue(isSectionOffset), - Label(L) {} - - /// EmitValue - Emit label value. - /// - virtual void EmitValue(AsmPrinter *AP, unsigned Form) const; - - /// getValue - Get MCSymbol. - /// - const MCSymbol *getValue() const { return Label; } - - /// SizeOf - Determine size of label value in bytes. - /// - virtual unsigned SizeOf(AsmPrinter *AP, unsigned Form) const; - - // Implement isa/cast/dyncast. - static bool classof(const DIELabel *) { return true; } - static bool classof(const DIEValue *L) { return L->getType() == isSectionOffset; } - #ifndef NDEBUG virtual void print(raw_ostream &O); #endif diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 9678078e76e..780fa405ef5 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -481,15 +481,6 @@ void DwarfDebug::addLabel(DIE *Die, unsigned Attribute, unsigned Form, Die->addValue(Attribute, Form, Value); } -/// addSectionOffset - Add a Dwarf section relative label attribute data and -/// value. -/// -void DwarfDebug::addSectionOffset(DIE *Die, unsigned Attribute, unsigned Form, - const MCSymbol *Label) { - DIEValue *Value = new (DIEValueAllocator) DIESectionOffset(Label); - Die->addValue(Attribute, Form, Value); -} - /// addDelta - Add a label delta attribute data and value. /// void DwarfDebug::addDelta(DIE *Die, unsigned Attribute, unsigned Form, @@ -1913,8 +1904,8 @@ void DwarfDebug::constructCompileUnit(const MDNode *N) { // DW_AT_stmt_list is a offset of line number information for this // compile unit in debug_line section. if (Asm->MAI->doesDwarfUsesAbsoluteLabelForStmtList()) - addSectionOffset(Die, dwarf::DW_AT_stmt_list, dwarf::DW_FORM_addr, - Asm->GetTempSymbol("section_line")); + addLabel(Die, dwarf::DW_AT_stmt_list, dwarf::DW_FORM_addr, + Asm->GetTempSymbol("section_line")); else addUInt(Die, dwarf::DW_AT_stmt_list, dwarf::DW_FORM_data4, 0); diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h index 2e920f502a2..7df0510fbfb 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.h +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h @@ -280,12 +280,6 @@ private: void addLabel(DIE *Die, unsigned Attribute, unsigned Form, const MCSymbol *Label); - /// addSectionOffset - Add a Dwarf section relative label attribute data and - /// value. - /// - void addSectionOffset(DIE *Die, unsigned Attribute, unsigned Form, - const MCSymbol *Label); - /// addDelta - Add a label delta attribute data and value. /// void addDelta(DIE *Die, unsigned Attribute, unsigned Form, diff --git a/lib/MC/MCAsmInfoCOFF.cpp b/lib/MC/MCAsmInfoCOFF.cpp index f6e240572b1..7fc7d7abb23 100644 --- a/lib/MC/MCAsmInfoCOFF.cpp +++ b/lib/MC/MCAsmInfoCOFF.cpp @@ -33,6 +33,5 @@ MCAsmInfoCOFF::MCAsmInfoCOFF() { HasLEB128 = true; // Target asm supports leb128 directives (little-endian) SupportsDebugInformation = true; DwarfSectionOffsetDirective = "\t.secrel32\t"; - DwarfUsesAbsoluteLabelForStmtList = false; HasMicrosoftFastStdCallMangling = true; } diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index 64fa8dd5f80..8d0698216f6 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -135,7 +135,6 @@ public: virtual void EmitCOFFSymbolStorageClass(int StorageClass); virtual void EmitCOFFSymbolType(int Type); virtual void EndCOFFSymbolDef(); - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol); virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value); virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment); @@ -385,11 +384,6 @@ void MCAsmStreamer::EndCOFFSymbolDef() { EmitEOL(); } -void MCAsmStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) { - OS << "\t.secrel32\t" << *Symbol << '\n'; - EmitEOL(); -} - void MCAsmStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) { assert(MAI.hasDotTypeDotSizeDirective()); OS << "\t.size\t" << *Symbol << ", " << *Value << '\n'; diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp index bd55055333c..e49074da399 100644 --- a/lib/MC/MCELFStreamer.cpp +++ b/lib/MC/MCELFStreamer.cpp @@ -108,10 +108,6 @@ public: assert(0 && "ELF doesn't support this directive"); } - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) { - assert(0 && "ELF doesn't support this directive"); - } - virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) { MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol); SD.setSize(Value); diff --git a/lib/MC/MCLoggingStreamer.cpp b/lib/MC/MCLoggingStreamer.cpp index bb01167327e..012c7f62f8a 100644 --- a/lib/MC/MCLoggingStreamer.cpp +++ b/lib/MC/MCLoggingStreamer.cpp @@ -120,11 +120,6 @@ public: return Child->EndCOFFSymbolDef(); } - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) { - LogCall("EndCOFFSymbolDef"); - return Child->EmitCOFFSecRel32(Symbol); - } - virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) { LogCall("EmitELFSize"); return Child->EmitELFSize(Symbol, Value); diff --git a/lib/MC/MCMachOStreamer.cpp b/lib/MC/MCMachOStreamer.cpp index a21dc1987d2..d1f9f5cd568 100644 --- a/lib/MC/MCMachOStreamer.cpp +++ b/lib/MC/MCMachOStreamer.cpp @@ -63,9 +63,6 @@ public: virtual void EndCOFFSymbolDef() { assert(0 && "macho doesn't support this directive"); } - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) { - assert(0 && "macho doesn't support this directive"); - } virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) { assert(0 && "macho doesn't support this directive"); } diff --git a/lib/MC/MCNullStreamer.cpp b/lib/MC/MCNullStreamer.cpp index 25844e49799..08ddf01d1a3 100644 --- a/lib/MC/MCNullStreamer.cpp +++ b/lib/MC/MCNullStreamer.cpp @@ -54,7 +54,6 @@ namespace { virtual void EmitCOFFSymbolStorageClass(int StorageClass) {} virtual void EmitCOFFSymbolType(int Type) {} virtual void EndCOFFSymbolDef() {} - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) {} virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {} virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, diff --git a/lib/MC/MCPureStreamer.cpp b/lib/MC/MCPureStreamer.cpp index 9e80b3bafdc..6098e6b8f38 100644 --- a/lib/MC/MCPureStreamer.cpp +++ b/lib/MC/MCPureStreamer.cpp @@ -83,9 +83,6 @@ public: virtual void EndCOFFSymbolDef() { report_fatal_error("unsupported directive in pure streamer"); } - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) { - report_fatal_error("unsupported directive in pure streamer"); - } virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) { report_fatal_error("unsupported directive in pure streamer"); } diff --git a/lib/MC/WinCOFFObjectWriter.cpp b/lib/MC/WinCOFFObjectWriter.cpp index dca4cdd6e7a..6ca5d37fc32 100644 --- a/lib/MC/WinCOFFObjectWriter.cpp +++ b/lib/MC/WinCOFFObjectWriter.cpp @@ -705,10 +705,6 @@ void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm, else llvm_unreachable("unsupported relocation type"); break; - case X86::reloc_coff_secrel32: - Reloc.Data.Type = Is64Bit ? COFF::IMAGE_REL_AMD64_SREL32 - : COFF::IMAGE_REL_I386_SECREL; - break; default: llvm_unreachable("unsupported relocation type"); } diff --git a/lib/MC/WinCOFFStreamer.cpp b/lib/MC/WinCOFFStreamer.cpp index ebcf24aa8a3..46968e601be 100644 --- a/lib/MC/WinCOFFStreamer.cpp +++ b/lib/MC/WinCOFFStreamer.cpp @@ -31,9 +31,6 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" - -#include "../Target/X86/X86FixupKinds.h" - using namespace llvm; namespace { @@ -62,7 +59,6 @@ public: virtual void EmitCOFFSymbolStorageClass(int StorageClass); virtual void EmitCOFFSymbolType(int Type); virtual void EndCOFFSymbolDef(); - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol); virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value); virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment); @@ -294,16 +290,6 @@ void WinCOFFStreamer::EndCOFFSymbolDef() { CurSymbol = NULL; } -void WinCOFFStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) -{ - MCDataFragment *DF = getOrCreateDataFragment(); - - DF->addFixup(MCFixup::Create(DF->getContents().size(), - MCSymbolRefExpr::Create (Symbol, getContext ()), - (MCFixupKind)X86::reloc_coff_secrel32)); - DF->getContents().resize(DF->getContents().size() + 4, 0); -} - void WinCOFFStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) { llvm_unreachable("not implemented"); } @@ -382,10 +368,6 @@ void WinCOFFStreamer::EmitInstruction(const MCInst &Instruction) { getCurrentSectionData()->setHasInstructions(true); - // Now that a machine instruction has been assembled into this section, make - // a line entry for any .loc directive that has been seen. - MCLineEntry::Make(this, getCurrentSection()); - MCInstFragment *Fragment = new MCInstFragment(Instruction, getCurrentSectionData()); diff --git a/lib/Target/PTX/PTXMCAsmStreamer.cpp b/lib/Target/PTX/PTXMCAsmStreamer.cpp index da62ebf39b5..0886ba8008f 100644 --- a/lib/Target/PTX/PTXMCAsmStreamer.cpp +++ b/lib/Target/PTX/PTXMCAsmStreamer.cpp @@ -124,7 +124,6 @@ public: virtual void EmitCOFFSymbolStorageClass(int StorageClass); virtual void EmitCOFFSymbolType(int Type); virtual void EndCOFFSymbolDef(); - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol); virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value); virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment); @@ -278,8 +277,6 @@ void PTXMCAsmStreamer::EmitCOFFSymbolType (int Type) {} void PTXMCAsmStreamer::EndCOFFSymbolDef() {} -void PTXMCAsmStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) {} - void PTXMCAsmStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {} void PTXMCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, diff --git a/lib/Target/X86/X86AsmBackend.cpp b/lib/Target/X86/X86AsmBackend.cpp index 6a0b059ca5a..da5f5b182ce 100644 --- a/lib/Target/X86/X86AsmBackend.cpp +++ b/lib/Target/X86/X86AsmBackend.cpp @@ -40,7 +40,6 @@ static unsigned getFixupKindLog2Size(unsigned Kind) { case X86::reloc_riprel_4byte_movq_load: case X86::reloc_signed_4byte: case X86::reloc_global_offset_table: - case X86::reloc_coff_secrel32: case FK_Data_4: return 2; case FK_PCRel_8: case FK_Data_8: return 3; @@ -70,8 +69,7 @@ public: { "reloc_riprel_4byte", 0, 4 * 8, MCFixupKindInfo::FKF_IsPCRel }, { "reloc_riprel_4byte_movq_load", 0, 4 * 8, MCFixupKindInfo::FKF_IsPCRel}, { "reloc_signed_4byte", 0, 4 * 8, 0}, - { "reloc_global_offset_table", 0, 4 * 8, 0}, - { "reloc_coff_secrel32", 0, 4 * 8, 0} + { "reloc_global_offset_table", 0, 4 * 8, 0} }; if (Kind < FirstTargetFixupKind) diff --git a/lib/Target/X86/X86FixupKinds.h b/lib/Target/X86/X86FixupKinds.h index d6cb39ae9a7..17d242ab761 100644 --- a/lib/Target/X86/X86FixupKinds.h +++ b/lib/Target/X86/X86FixupKinds.h @@ -23,8 +23,6 @@ enum Fixups { reloc_global_offset_table, // 32-bit, relative to the start // of the instruction. Used only // for _GLOBAL_OFFSET_TABLE_. - reloc_coff_secrel32, // PE-COFF section relative 32 - // (only valid for win32 COFF) // Marker LastTargetFixupKind, NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind diff --git a/lib/Target/X86/X86MCAsmInfo.cpp b/lib/Target/X86/X86MCAsmInfo.cpp index 75bc1ed2bee..6686214e06f 100644 --- a/lib/Target/X86/X86MCAsmInfo.cpp +++ b/lib/Target/X86/X86MCAsmInfo.cpp @@ -113,7 +113,4 @@ X86MCAsmInfoCOFF::X86MCAsmInfoCOFF(const Triple &Triple) { AssemblerDialect = AsmWriterFlavor; TextAlignFillValue = 0x90; - - // Debug Information - SupportsDebugInformation = true; } -- 2.34.1