Use DwarfWriter to record dbg variables.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62185 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index 9d7ff15..cdc7951 100644
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -32,7 +32,7 @@
class GlobalVariable;
class MachineConstantPoolEntry;
class MachineConstantPoolValue;
- class MachineModuleInfo;
+ class DwarfWriter;
class Mangler;
class Section;
class TargetAsmInfo;
@@ -51,10 +51,10 @@
///
unsigned FunctionNumber;
- /// MachineModuleInfo - This is needed because printDeclare() has to insert
- /// DebugVariable entries into the dwarf table. This is a short term hack
+ /// DW -This is needed because printDeclare() has to insert
+ /// DbgVariable entries into the dwarf table. This is a short term hack
/// that ought be fixed soon.
- MachineModuleInfo *MMI;
+ DwarfWriter *DW;
// GCMetadataPrinters - The garbage collection metadata printer table.
typedef DenseMap<GCStrategy*,GCMetadataPrinter*> gcp_map_type;
diff --git a/include/llvm/CodeGen/DwarfWriter.h b/include/llvm/CodeGen/DwarfWriter.h
index 24b0f97..19601a4 100644
--- a/include/llvm/CodeGen/DwarfWriter.h
+++ b/include/llvm/CodeGen/DwarfWriter.h
@@ -93,6 +93,10 @@
/// getRecordSourceLineCount - Count source lines.
unsigned getRecordSourceLineCount();
+ /// RecordVariable - Indicate the declaration of a local variable.
+ ///
+ void RecordVariable(GlobalVariable *GV, unsigned FrameIndex);
+
/// hasDebugInfo - Return true if debug info intrinsics are seen in
/// this module.
bool hasDebugInfo();
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 47a19dd..6627543 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -20,6 +20,7 @@
#include "llvm/CodeGen/MachineConstantPool.h"
#include "llvm/CodeGen/MachineJumpTableInfo.h"
#include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/CodeGen/DwarfWriter.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetAsmInfo.h"
@@ -162,9 +163,9 @@
SwitchToDataSection(""); // Reset back to no section.
- MMI = getAnalysisToUpdate<MachineModuleInfo>();
+ MachineModuleInfo *MMI = getAnalysisToUpdate<MachineModuleInfo>();
if (MMI) MMI->AnalyzeModule(M);
-
+ DW = getAnalysisToUpdate<DwarfWriter>();
return false;
}
@@ -1419,9 +1420,9 @@
/// FIXME: It doesn't really print anything rather it inserts a DebugVariable
/// entry into dwarf table.
void AsmPrinter::printDeclare(const MachineInstr *MI) const {
- int FI = MI->getOperand(0).getIndex();
+ unsigned FI = MI->getOperand(0).getIndex();
GlobalValue *GV = MI->getOperand(1).getGlobal();
- MMI->RecordVariable(GV, FI);
+ DW->RecordVariable(cast<GlobalVariable>(GV), FI);
}
/// PrintAsmOperand - Print the specified operand of MI, an INLINEASM
diff --git a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
index d79e6aa..675ae98 100644
--- a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
@@ -4985,6 +4985,12 @@
return DD->getRecordSourceLineCount();
}
+/// RecordVariable - Indicate the declaration of a local variable.
+///
+void DwarfWriter::RecordVariable(GlobalVariable *GV, unsigned FrameIndex) {
+ DD->RecordVariable(GV, FrameIndex);
+}
+
/// hasDebugInfo - Return true if debug info intrinsics are seen in
/// this module.
bool DwarfWriter::hasDebugInfo() {