Replace Line:Column storage with Poiters and on demand conversion

Author: Bertik23

llvm/include/llvm/AsmParser/LLLexer.h

@@ -17,27 +17,20 @@
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/APSInt.h"
 #include "llvm/Support/SMLoc.h"
+#include "llvm/Support/SourceMgr.h"
 #include <string>
 
 namespace llvm {
   class Type;
   class SMDiagnostic;
-  class SourceMgr;
   class LLVMContext;
 
   class LLLexer {
     const char *CurPtr;
     StringRef CurBuf;
 
-    // The line number of the start of the current token, zero-indexed
-    unsigned CurTokLineNum = 0;
-    // The column number of the start of the current token, zero-indexed
-    unsigned CurTokColNum = 0;
-    // The line number of the end of the current token, zero-indexed
-    unsigned PrevTokEndLineNum = -1;
-    // The column number of the end (exclusive) of the current token,
-    // zero-indexed
-    unsigned PrevTokEndColNum = -1;
+    // The the end (exclusive) of the current token
+    const char *PrevTokEnd = nullptr;
 
     enum class ErrorPriority {
       None,   // No error message present.
@@ -87,16 +80,22 @@ namespace llvm {
       IgnoreColonInIdentifiers = val;
     }
 
-    // Get the line number of the start of the current token, zero-indexed
-    unsigned getTokLineNum() { return CurTokLineNum; }
-    // Get the column number of the start of the current token, zero-indexed
-    unsigned getTokColNum() { return CurTokColNum; }
-    // Get the line number of the end of the previous token, zero-indexed,
-    // exclusive
-    unsigned getPrevTokEndLineNum() { return PrevTokEndLineNum; }
-    // Get the column number of the end of the previous token, zero-indexed,
-    // exclusive
-    unsigned getPrevTokEndColNum() { return PrevTokEndColNum; }
+    // Get the line, column position of the start of the current token,
+    // zero-indexed
+    std::pair<unsigned, unsigned> getTokLineColumnPos() {
+      auto LC = SM.getLineAndColumn(SMLoc::getFromPointer(TokStart));
+      --LC.first;
+      --LC.second;
+      return LC;
+    }
+    // Get the line, column position of the end of the previous token,
+    // zero-indexed exclusive
+    std::pair<unsigned, unsigned> getPrevTokEndLineColumnPos() {
+      auto LC = SM.getLineAndColumn(SMLoc::getFromPointer(PrevTokEnd));
+      --LC.first;
+      --LC.second;
+      return LC;
+    }
 
     // This returns true as a convenience for the parser functions that return
     // true on error.

llvm/include/llvm/IR/Value.h

@@ -68,6 +68,7 @@ struct FileLoc {
   }
 
   FileLoc(unsigned L, unsigned C) : Line(L), Col(C) {}
+  FileLoc(std::pair<unsigned, unsigned> LC) : Line(LC.first), Col(LC.second) {}
 };
 
 struct FileLocRange {

llvm/lib/AsmParser/LLLexer.cpp

@@ -205,16 +205,9 @@ void LLLexer::advancePositionTo(const char *Ptr) {
 lltok::Kind LLLexer::LexToken() {
   // Set token end to next location, since the end is
   // exclusive
-  std::tie(PrevTokEndLineNum, PrevTokEndColNum) =
-      SM.getLineAndColumn(SMLoc::getFromPointer(CurPtr));
-  --PrevTokEndLineNum;
-  --PrevTokEndColNum;
+  PrevTokEnd = CurPtr;
   while (true) {
     TokStart = CurPtr;
-    std::tie(CurTokLineNum, CurTokColNum) =
-        SM.getLineAndColumn(SMLoc::getFromPointer(CurPtr));
-    --CurTokLineNum;
-    --CurTokColNum;
     int CurChar = getNextChar();
 
     switch (CurChar) {

llvm/lib/AsmParser/LLParser.cpp

@@ -740,7 +740,7 @@ bool LLParser::parseDeclare() {
 ///   ::= 'define' FunctionHeader (!dbg !56)* '{' ...
 bool LLParser::parseDefine() {
   assert(Lex.getKind() == lltok::kw_define);
-  FileLoc FunctionStart(Lex.getTokLineNum(), Lex.getTokColNum());
+  FileLoc FunctionStart(Lex.getTokLineColumnPos());
   Lex.Lex();
 
   Function *F;
@@ -752,8 +752,7 @@ bool LLParser::parseDefine() {
       parseFunctionBody(*F, FunctionNumber, UnnamedArgNums);
   if (ParserContext)
     ParserContext->addFunctionLocation(
-        F, FileLocRange(FunctionStart, {Lex.getPrevTokEndLineNum(),
-                                        Lex.getPrevTokEndColNum()}));
+        F, FileLocRange(FunctionStart, Lex.getPrevTokEndLineColumnPos()));
 
   return RetValue;
 }
@@ -6959,7 +6958,7 @@ bool LLParser::parseFunctionBody(Function &Fn, unsigned FunctionNumber,
 /// parseBasicBlock
 ///   ::= (LabelStr|LabelID)? Instruction*
 bool LLParser::parseBasicBlock(PerFunctionState &PFS) {
-  FileLoc BBStart(Lex.getTokLineNum(), Lex.getTokColNum());
+  FileLoc BBStart(Lex.getTokLineColumnPos());
 
   // If this basic block starts out with a name, remember it.
   std::string Name;
@@ -7002,7 +7001,7 @@ bool LLParser::parseBasicBlock(PerFunctionState &PFS) {
       TrailingDbgRecord.emplace_back(DR, DeleteDbgRecord);
     }
 
-    FileLoc InstStart(Lex.getTokLineNum(), Lex.getTokColNum());
+    FileLoc InstStart(Lex.getTokLineColumnPos());
     // This instruction may have three possibilities for a name: a) none
     // specified, b) name specified "%foo =", c) number specified: "%4 =".
     LocTy NameLoc = Lex.getLoc();
@@ -7054,15 +7053,13 @@ bool LLParser::parseBasicBlock(PerFunctionState &PFS) {
     TrailingDbgRecord.clear();
     if (ParserContext) {
       ParserContext->addInstructionLocation(
-          Inst, FileLocRange(InstStart, {Lex.getPrevTokEndLineNum(),
-                                         Lex.getPrevTokEndColNum()}));
+          Inst, FileLocRange(InstStart, Lex.getPrevTokEndLineColumnPos()));
     }
   } while (!Inst->isTerminator());
 
   if (ParserContext)
     ParserContext->addBlockLocation(
-        BB, FileLocRange(BBStart, {Lex.getPrevTokEndLineNum(),
-                                   Lex.getPrevTokEndColNum()}));
+        BB, FileLocRange(BBStart, Lex.getPrevTokEndLineColumnPos()));
 
   assert(TrailingDbgRecord.empty() &&
          "All debug values should have been attached to an instruction.");