Revert 102135, 102129, 102127, 102106, 102104, 102102, 102012, 102004,
because 102004 causes codegen to emit invalid assembly on at least
x86_64-unknown-gnu-linux.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@102155 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h
index 16d4137..bfd6f48 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -188,22 +188,16 @@
DenseMap<MDNode*, SmallVector<InlineInfoLabels, 4> > InlineInfo;
SmallVector<MDNode *, 4> InlinedSPNodes;
- /// LabelsBeforeInsn - Maps instruction with label emitted before
+ /// InsnBeforeLabelMap - Maps instruction with label emitted before
/// instruction.
- DenseMap<const MachineInstr *, MCSymbol *> LabelsBeforeInsn;
+ DenseMap<const MachineInstr *, MCSymbol *> InsnBeforeLabelMap;
- /// LabelsAfterInsn - Maps instruction with label emitted after
+ /// InsnAfterLabelMap - Maps instruction with label emitted after
/// instruction.
- DenseMap<const MachineInstr *, MCSymbol *> LabelsAfterInsn;
+ DenseMap<const MachineInstr *, MCSymbol *> InsnAfterLabelMap;
SmallVector<const MCSymbol *, 8> DebugRangeSymbols;
- /// weakDebugRangeSymbols - In cases where function bodies is not emitted
- /// into .text section, use function begin marker as anchor for debug range
- /// offsets. This map keeps track of such symbols and corresponding
- /// function begin marker symbols.
- DenseMap<const MCSymbol *, const MCSymbol *> WeakDebugRangeSymbols;
-
/// Previous instruction's location information. This is used to determine
/// label location to indicate scope boundries in dwarf debug info.
DebugLoc PrevInstLoc;
@@ -224,8 +218,7 @@
// section offsets and are created by EmitSectionLabels.
MCSymbol *DwarfFrameSectionSym, *DwarfInfoSectionSym, *DwarfAbbrevSectionSym;
MCSymbol *DwarfStrSectionSym, *TextSectionSym, *DwarfDebugRangeSectionSym;
-
- MCSymbol *FunctionBeginSym;
+
private:
/// getSourceDirectoryAndFileIds - Return the directory and file ids that
@@ -375,8 +368,13 @@
/// createSubprogramDIE - Create new DIE using SP.
DIE *createSubprogramDIE(const DISubprogram &SP, bool MakeDecl = false);
- /// getOrCreateDbgScope - Create DbgScope for the scope.
- DbgScope *getOrCreateDbgScope(MDNode *Scope, MDNode *InlinedAt);
+ /// getUpdatedDbgScope - Find or create DbgScope assicated with
+ /// the instruction. Initialize scope and update scope hierarchy.
+ DbgScope *getUpdatedDbgScope(MDNode *N, const MachineInstr *MI,
+ MDNode *InlinedAt);
+
+ /// createDbgScope - Create DbgScope for the scope.
+ void createDbgScope(MDNode *Scope, MDNode *InlinedAt);
DbgScope *getOrCreateAbstractScope(MDNode *N);