commit 30fc933e5fbbb5f0ea60c47976d435254e378536
author Chris Lattner <sabre@nondot.org> Wed Feb 04 01:06:56 2009 +0000
committer Chris Lattner <sabre@nondot.org> Wed Feb 04 01:06:56 2009 +0000
tree 19a0f7e4b89828c3609273aebd49d0ec19d35faf
parent e7353a6a5298d49241afaf6da58d79dd25a65c66

lower the interface to getLineNumber like we did for
getColumnNumber.  This fixes a FIXME in 
SourceManager::getPresumedLoc because we now just decompose
the sloc once.


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

Driver/PrintPreprocessedOutput.cpp

diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp
index 2c764ad..370adc7 100644
--- a/Driver/PrintPreprocessedOutput.cpp
+++ b/Driver/PrintPreprocessedOutput.cpp
@@ -162,7 +162,7 @@
   }
   
   Loc = SourceMgr.getInstantiationLoc(Loc);
-  CurLine = SourceMgr.getLineNumber(Loc);
+  CurLine = SourceMgr.getInstantiationLineNumber(Loc);
 
   if (DisableLineMarkers) return;
 

Driver/RewriteObjC.cpp

diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index facb195..f860433 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -766,7 +766,8 @@
   SourceLocation LocStart = Method->getLocStart();
   SourceLocation LocEnd = Method->getLocEnd();
     
-  if (SM->getLineNumber(LocEnd) > SM->getLineNumber(LocStart)) {
+  if (SM->getInstantiationLineNumber(LocEnd) >
+      SM->getInstantiationLineNumber(LocStart)) {
     InsertText(LocStart, "#if 0\n", 6);
     ReplaceText(LocEnd, 1, ";\n#endif\n", 9);
   } else {