Keep track of DISubprogram in LLParser::PerFunctionState, Change assigning of debug info metadata

Author: thestr4ng3r

src/AsmParser/LLParser.cpp

@@ -421,10 +421,10 @@ bool LLParser::ParseDefine() {
   if(ParseFunctionHeader(F, true))
     return true;
 
-  DebugInfo.addFunction(F);
+  DISubprogram *SP = DebugInfo.addFunction(F);
 
   return ParseOptionalFunctionMetadata(*F) ||
-         ParseFunctionBody(*F);
+         ParseFunctionBody(*F, SP);
 }
 
 /// ParseGlobalType
@@ -2291,8 +2291,8 @@ bool LLParser::ParseArrayVectorType(Type *&Result, bool isVector) {
 //===----------------------------------------------------------------------===//
 
 LLParser::PerFunctionState::PerFunctionState(LLParser &p, Function &f,
-                                             int functionNumber)
-  : P(p), F(f), FunctionNumber(functionNumber) {
+                                             int functionNumber, DISubprogram *DebugSubprogram)
+  : P(p), F(f), FunctionNumber(functionNumber), DebugSubprogram(DebugSubprogram) {
 
   // Insert unnamed arguments into the NumberedVals list.
   for (Argument &A : F.args())
@@ -4613,15 +4613,15 @@ bool LLParser::PerFunctionState::resolveForwardRefBlockAddresses() {
 
 /// ParseFunctionBody
 ///   ::= '{' BasicBlock+ UseListOrderDirective* '}'
-bool LLParser::ParseFunctionBody(Function &Fn) {
+bool LLParser::ParseFunctionBody(Function &Fn, DISubprogram *SP) {
   if (Lex.getKind() != lltok::lbrace)
     return TokError("expected '{' in function body");
   Lex.Lex();  // eat the {.
 
   int FunctionNumber = -1;
   if (!Fn.hasName()) FunctionNumber = NumberedVals.size()-1;
 
-  PerFunctionState PFS(*this, Fn, FunctionNumber);
+  PerFunctionState PFS(*this, Fn, FunctionNumber, SP);
 
   // Resolve block addresses and allow basic blocks to be forward-declared
   // within this function.
@@ -4693,7 +4693,7 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
     default: llvm_unreachable("Unknown ParseInstruction result!");
     case InstError: return true;
     case InstNormal:
-      DebugInfo.addInstruction(Inst, InstLine);
+      DebugInfo.addInstruction(Inst, PFS.getDebugSubprogram(), InstLine);
       BB->getInstList().push_back(Inst);
 
       // With a normal result, we check to see if the instruction is followed by
@@ -4703,7 +4703,7 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
           return true;
       break;
     case InstExtraComma:
-      DebugInfo.addInstruction(Inst, InstLine);
+      DebugInfo.addInstruction(Inst, PFS.getDebugSubprogram(), InstLine);
       BB->getInstList().push_back(Inst);
 
       // If the instruction parser ate an extra comma at the end of it, it

src/AsmParser/LLParser.h

@@ -317,14 +317,17 @@ namespace llvm {
       std::map<unsigned, std::pair<Value*, LocTy> > ForwardRefValIDs;
       std::vector<Value*> NumberedVals;
 
+      DISubprogram *DebugSubprogram;
+
       /// FunctionNumber - If this is an unnamed function, this is the slot
       /// number of it, otherwise it is -1.
       int FunctionNumber;
     public:
-      PerFunctionState(LLParser &p, Function &f, int FunctionNumber);
+      PerFunctionState(LLParser &p, Function &f, int FunctionNumber, DISubprogram *DebugSubprogram);
       ~PerFunctionState();
 
       Function &getFunction() const { return F; }
+      DISubprogram *getDebugSubprogram() const { return DebugSubprogram; };
 
       bool FinishFunction();
 
@@ -445,7 +448,7 @@ namespace llvm {
     };
     bool ParseArgumentList(SmallVectorImpl<ArgInfo> &ArgList, bool &isVarArg);
     bool ParseFunctionHeader(Function *&Fn, bool isDefine);
-    bool ParseFunctionBody(Function &Fn);
+    bool ParseFunctionBody(Function &Fn, DISubprogram *SP);
     bool ParseBasicBlock(PerFunctionState &PFS);
 
     enum TailCallType { TCT_None, TCT_Tail, TCT_MustTail };

src/LLDebugInfo/LLDebugInfo.cpp

@@ -18,26 +18,27 @@ LLDebugInfo::LLDebugInfo(llvm::Module *M, StringRef Filename, StringRef Director
   M->addModuleFlag(Module::Error, "Dwarf Version", 4);
 
   CU = DIB.createCompileUnit(dwarf::DW_LANG_lo_user,
-                                           Filename,
-                                           Directory,
-                                           "llvm-dbas",
-                                           false,
-                                           "",
-                                           0);
+                             Filename,
+                             Directory,
+                             "llvm-dbas",
+                             false,
+                             "",
+                             0);
 
   File = CU->getFile();
 }
 
-void LLDebugInfo::addFunction(Function *F) {
+DISubprogram *LLDebugInfo::addFunction(Function *F) {
   DITypeRefArray a;
   DISubroutineType *ST = DIB.createSubroutineType(a);
-  Subprogram = DIB.createFunction(File, F->getName(), F->getName(), File, 0, ST, true, true, 0);
-  F->setMetadata("dbg", Subprogram);
+  DISubprogram *SP = DIB.createFunction(File, F->getName(), F->getName(), File, 0, ST, true, true, 0);
+  F->setSubprogram(SP);
+  return SP;
 }
 
-void LLDebugInfo::addInstruction(Instruction *I, unsigned int Line) {
-  DILocation *DebugLocation = DILocation::get(M->getContext(), Line + 1, 0, Subprogram);
-  I->setMetadata("dbg", DebugLocation);
+void LLDebugInfo::addInstruction(Instruction *I, DISubprogram *SP, unsigned int Line) {
+  DebugLoc loc = DebugLoc::get(Line, 0, SP);
+  I->setDebugLoc(loc);
 }
 
 void LLDebugInfo::finalize() {

src/LLDebugInfo/LLDebugInfo.h

@@ -25,14 +25,11 @@ namespace llvm {
     DICompileUnit *CU;
     DIFile *File;
 
-    // TODO: do not save this as a member
-    DISubprogram *Subprogram;
-
   public:
     LLDebugInfo(llvm::Module *M, StringRef File, StringRef Directory);
 
-    void addFunction(Function *F);
-    void addInstruction(Instruction *I, unsigned int line);
+    DISubprogram *addFunction(Function *F);
+    void addInstruction(Instruction *I, DISubprogram *SP, unsigned int line);
     void finalize();
   };
 }