commit 9dc1f530c086d2c16f8cba758b0f59a5bf41323a
author Chris Lattner <sabre@nondot.org> Fri Jul 20 16:37:10 2007 +0000
committer Chris Lattner <sabre@nondot.org> Fri Jul 20 16:37:10 2007 +0000
tree a68f846d3ccbf60f1b03c6a382a7e706dfa917ee
parent 030d8846c7e520330007087e949f621989876e3a

Reimplement SourceLocation.  Instead of having a 
fileid/offset pair, it now contains a bit discriminating between
mapped locations and file locations.  This separates the tables for
macros and files in SourceManager, and allows better separation of
concepts in the rest of the compiler.  This allows us to have *many*
macro instantiations before running out of 'addressing space'.

This is also more efficient, because testing whether something is a
macro expansion is now a bit test instead of a table lookup (which
also used to require having a srcmgr around, now it doesn't).

This is fully functional, but there are several refinements and
optimizations left.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@40103 91177308-0d34-0410-b5e6-96231b3b80d8

Driver/DiagChecker.cpp

diff --git a/Driver/DiagChecker.cpp b/Driver/DiagChecker.cpp
index 76b0526..9830c0d 100644
--- a/Driver/DiagChecker.cpp
+++ b/Driver/DiagChecker.cpp
@@ -60,7 +60,7 @@
     if (OpenDiag == std::string::npos) {
       fprintf(stderr,
               "oops:%d: Cannot find beginning of expected error string\n",
-              SourceMgr.getLineNumber(Pos));
+              SourceMgr.getLogicalLineNumber(Pos));
       break;
     }
 
@@ -70,7 +70,7 @@
     if (CloseDiag == std::string::npos) {
       fprintf(stderr,
               "oops:%d: Cannot find end of expected error string\n",
-              SourceMgr.getLineNumber(Pos));
+              SourceMgr.getLogicalLineNumber(Pos));
       break;
     }
 
@@ -126,7 +126,7 @@
 
   for (const_diag_iterator I = diag_begin, E = diag_end; I != E; ++I)
     fprintf(stderr, "  Line %d: %s\n",
-            SourceMgr.getLineNumber(I->first),
+            SourceMgr.getLogicalLineNumber(I->first),
             I->second.c_str());
 
   return true;
@@ -144,12 +144,12 @@
   DiagList DiffList;
 
   for (const_diag_iterator I = d1_begin, E = d1_end; I != E; ++I) {
-    unsigned LineNo1 = SourceMgr.getLineNumber(I->first);
+    unsigned LineNo1 = SourceMgr.getLogicalLineNumber(I->first);
     const std::string &Diag1 = I->second;
     bool Found = false;
 
     for (const_diag_iterator II = d2_begin, IE = d2_end; II != IE; ++II) {
-      unsigned LineNo2 = SourceMgr.getLineNumber(II->first);
+      unsigned LineNo2 = SourceMgr.getLogicalLineNumber(II->first);
       if (LineNo1 != LineNo2) continue;
 
       const std::string &Diag2 = II->second;