[clang] Move two utility functions into SourceManager

[lebedev.ri]

Summary

So we can keep that not-so-great logic in one place.

[rsmith]

Thanks, LG. I bet there's a bunch more places we could change to call these two.

[lebedev.ri]

In D53837#1279891, @rsmith wrote:

Thanks, LG. I bet there's a bunch more places we could change to call these two.

Thank you for the review.

cfe/trunk/include/clang/Basic/SourceManager.h

public:
   /// Returns true if the spelling location for the given location
   /// is in the main file buffer.
   ///
   /// This check ignores line marker directives.
   bool isWrittenInMainFile(SourceLocation Loc) const {
     return getFileID(Loc) == getMainFileID();
   }
 
+  /// Returns whether \p Loc is located in a <built-in> file.
+  bool isWrittenInBuiltinFile(SourceLocation Loc) const {
+    StringRef Filename(getPresumedLoc(Loc).getFilename());
+    return Filename.equals("<built-in>");
+  }
+
+  /// Returns whether \p Loc is located in a <command line> file.
+  bool isWrittenInCommandLineFile(SourceLocation Loc) const {
+    StringRef Filename(getPresumedLoc(Loc).getFilename());
+    return Filename.equals("<command line>");
+  }
+
   /// Returns if a SourceLocation is in a system header.
   bool isInSystemHeader(SourceLocation Loc) const {
     return isSystem(getFileCharacteristic(Loc));
   }
 
   /// Returns if a SourceLocation is in an "extern C" system header.
   bool isInExternCSystemHeader(SourceLocation Loc) const {
     return getFileCharacteristic(Loc) == SrcMgr::C_ExternCSystem;

cfe/trunk/lib/CodeGen/MacroPPCallbacks.cpp

SourceLocation MacroPPCallbacks::getCorrectLocation(SourceLocation Loc) {
   if (Status == MainFileScope || EnteredCommandLineIncludeFiles)
     return Loc;
 
   // While parsing skipped files, location of macros is invalid.
   // Invalid location represents line zero.
   return SourceLocation();
 }
 
-static bool isBuiltinFile(SourceManager &SM, SourceLocation Loc) {
-  StringRef Filename(SM.getPresumedLoc(Loc).getFilename());
-  return Filename.equals("<built-in>");
-}
-
-static bool isCommandLineFile(SourceManager &SM, SourceLocation Loc) {
-  StringRef Filename(SM.getPresumedLoc(Loc).getFilename());
-  return Filename.equals("<command line>");
-}
-
 void MacroPPCallbacks::updateStatusToNextScope() {
   switch (Status) {
   case NoScope:
     Status = InitializedScope;
     break;
   case InitializedScope:
     Status = BuiltinScope;
     break;
void MacroPPCallbacks::FileEntered(SourceLocation Loc) {
   switch (Status) {
   case NoScope:
     updateStatusToNextScope();
     break;
   case InitializedScope:
     updateStatusToNextScope();
     return;
   case BuiltinScope:
-    if (isCommandLineFile(PP.getSourceManager(), Loc))
+    if (PP.getSourceManager().isWrittenInCommandLineFile(Loc))
       return;
     updateStatusToNextScope();
     LLVM_FALLTHROUGH;
   case CommandLineIncludeScope:
     EnteredCommandLineIncludeFiles++;
     break;
   case MainFileScope:
     break;
   }
 
   Scopes.push_back(Gen->getCGDebugInfo()->CreateTempMacroFile(getCurrentScope(),
                                                               LineLoc, Loc));
 }
 
 void MacroPPCallbacks::FileExited(SourceLocation Loc) {
   switch (Status) {
   default:
     llvm_unreachable("Do not expect to exit a file from current scope");
   case BuiltinScope:
-    if (!isBuiltinFile(PP.getSourceManager(), Loc))
+    if (!PP.getSourceManager().isWrittenInBuiltinFile(Loc))
       // Skip next scope and change status to MainFileScope.
       Status = MainFileScope;
     return;
   case CommandLineIncludeScope:
     if (!EnteredCommandLineIncludeFiles) {
       updateStatusToNextScope();
       return;
     }