[Diagnostics] Add buffer offset information to the serialized diagnostics

xedin · xedin · commit ceebece399f5 · 2017-05-22T19:45:42.000-07:00
Some of the tools rely on the presence of buffer offset to correctly
navigate to the diagnostic area from the serialized diagnostics output,
let's get it based on the source location provided.

Resolves: rdar://problem/22935476
diff --git a/lib/Frontend/SerializedDiagnosticConsumer.cpp b/lib/Frontend/SerializedDiagnosticConsumer.cpp
@@ -266,13 +266,14 @@ void SerializedDiagnosticConsumer::addLocToRecord(SourceLoc Loc,
     return;
   }
 
+  auto bufferId = SM.findBufferContainingLoc(Loc);
   unsigned line, col;
   std::tie(line, col) = SM.getLineAndColumn(Loc);
 
   Record.push_back(getEmitFile(Filename));
   Record.push_back(line);
   Record.push_back(col);
-  Record.push_back(0);
+  Record.push_back(SM.getLocOffsetInBuffer(Loc, bufferId));
 }
 
 void SerializedDiagnosticConsumer::addRangeToRecord(CharSourceRange Range,

Original file line number	Diff line number	Diff line change
`@@ -266,13 +266,14 @@ void SerializedDiagnosticConsumer::addLocToRecord(SourceLoc Loc,`
`266`	`266`	`return;`
`267`	`267`	`}`
`268`	`268`
	`269`	`+ auto bufferId = SM.findBufferContainingLoc(Loc);`
`269`	`270`	`unsigned line, col;`
`270`	`271`	`std::tie(line, col) = SM.getLineAndColumn(Loc);`
`271`	`272`
`272`	`273`	`Record.push_back(getEmitFile(Filename));`
`273`	`274`	`Record.push_back(line);`
`274`	`275`	`Record.push_back(col);`
`275`		`- Record.push_back(0);`
	`276`	`+ Record.push_back(SM.getLocOffsetInBuffer(Loc, bufferId));`
`276`	`277`	`}`
`277`	`278`
`278`	`279`	`void SerializedDiagnosticConsumer::addRangeToRecord(CharSourceRange Range,`