commit 9c728dc4d8da89c73fcae74c9e72d7a83ffd7b6d
author Ted Kremenek <kremenek@apple.com> Wed Dec 12 22:39:36 2007 +0000
committer Ted Kremenek <kremenek@apple.com> Wed Dec 12 22:39:36 2007 +0000
tree e89a3acd2ddb4a993e1d6bac53c05628b24f4f2b
parent 5e71124dabe8017f17ce8996e4161a202694e3e6

TargetInfo no longer includes a reference to SourceManager.

Moved all clients of Diagnostics to use FullSourceLoc instead of SourceLocation.
Added many utility methods to FullSourceLoc to provide shorthand for:

    FullLoc.getManager().someMethod(FullLoc.getLocation());
    
instead we have:

    FullLoc.someMethod();
    
Modified TextDiagnostics (and related classes) to use this short-hand.


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

Lex/PPExpressions.cpp

diff --git a/Lex/PPExpressions.cpp b/Lex/PPExpressions.cpp
index ec20eb1..ff0c36c 100644
--- a/Lex/PPExpressions.cpp
+++ b/Lex/PPExpressions.cpp
@@ -112,15 +112,17 @@
       if (Macro->isTargetSpecific()) {
         // Don't warn on second use.
         Macro->setIsTargetSpecific(false);
-        PP.getTargetInfo().DiagnoseNonPortability(PeekTok.getLocation(),
-                                                  diag::port_target_macro_use);
+        PP.getTargetInfo().DiagnoseNonPortability(
+          PP.getFullLoc(PeekTok.getLocation()),
+          diag::port_target_macro_use);
       }
     } else if (ValueLive) {
       // Use of a target-specific macro for some other target?  If so, warn.
       if (II->isOtherTargetMacro()) {
         II->setIsOtherTargetMacro(false);  // Don't warn on second use.
-        PP.getTargetInfo().DiagnoseNonPortability(PeekTok.getLocation(),
-                                                  diag::port_target_macro_use);
+        PP.getTargetInfo().DiagnoseNonPortability(
+          PP.getFullLoc(PeekTok.getLocation()),
+          diag::port_target_macro_use);
       }
     }
 
@@ -211,16 +213,16 @@
     TargetInfo &TI = PP.getTargetInfo();
     unsigned NumBits;
     if (Literal.isWide())
-      NumBits = TI.getWCharWidth(PeekTok.getLocation());
+      NumBits = TI.getWCharWidth(PP.getFullLoc(PeekTok.getLocation()));
     else
-      NumBits = TI.getCharWidth(PeekTok.getLocation());
+      NumBits = TI.getCharWidth(PP.getFullLoc(PeekTok.getLocation()));
     
     // Set the width.
     llvm::APSInt Val(NumBits);
     // Set the value.
     Val = Literal.getValue();
     // Set the signedness.
-    Val.setIsUnsigned(!TI.isCharSigned(PeekTok.getLocation()));
+    Val.setIsUnsigned(!TI.isCharSigned(PP.getFullLoc(PeekTok.getLocation())));
     
     if (Result.getBitWidth() > Val.getBitWidth()) {
       if (Val.isSigned())
@@ -617,7 +619,9 @@
   Lex(Tok);
   
   // C99 6.10.1p3 - All expressions are evaluated as intmax_t or uintmax_t.
-  unsigned BitWidth = getTargetInfo().getIntMaxTWidth(Tok.getLocation());
+  unsigned BitWidth = 
+    getTargetInfo().getIntMaxTWidth(getFullLoc(Tok.getLocation()));
+    
   llvm::APSInt ResVal(BitWidth);
   DefinedTracker DT;
   if (EvaluateValue(ResVal, Tok, DT, true, *this)) {