[TBDGen] Remove llvm namespace from StringRef.

Small cleanup in the APIGen files to remove the need to namespace StringRef with llvm by including "swift/Basic/LLVM.h".

Author: ributzka

lib/TBDGen/APIGen.cpp

@@ -24,26 +24,26 @@
 namespace swift {
 namespace apigen {
 
-void API::addSymbol(llvm::StringRef symbol, APILoc loc, APILinkage linkage,
+void API::addSymbol(StringRef symbol, APILoc loc, APILinkage linkage,
                     APIFlags flags, APIAccess access,
                     APIAvailability availability) {
   auto *global = new (allocator) GlobalRecord(
       symbol, loc, linkage, flags, access, GVKind::Function, availability);
   globals.push_back(global);
 }
 
-ObjCInterfaceRecord *API::addObjCClass(llvm::StringRef name, APILinkage linkage,
+ObjCInterfaceRecord *API::addObjCClass(StringRef name, APILinkage linkage,
                                        APILoc loc, APIAccess access,
                                        APIAvailability availability,
-                                       llvm::StringRef superClassName) {
+                                       StringRef superClassName) {
   auto *interface = new (allocator) ObjCInterfaceRecord(
       name, linkage, loc, access, availability, superClassName);
   interfaces.push_back(interface);
   return interface;
 }
 
-void API::addObjCMethod(ObjCInterfaceRecord *cls, llvm::StringRef name,
-                        APILoc loc, APIAccess access, bool isInstanceMethod,
+void API::addObjCMethod(ObjCInterfaceRecord *cls, StringRef name, APILoc loc,
+                        APIAccess access, bool isInstanceMethod,
                         bool isOptional, APIAvailability availability) {
   auto method = new (allocator) ObjCMethodRecord(
       name, loc, access, isInstanceMethod, isOptional, availability);

lib/TBDGen/APIGen.h

@@ -12,6 +12,7 @@
 #ifndef SWIFT_APIGEN_APIGEN_H
 #define SWIFT_APIGEN_APIGEN_H
 
+#include "swift/Basic/LLVM.h"
 #include "llvm/ADT/BitmaskEnum.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/Optional.h"
@@ -57,7 +58,7 @@ class APILoc {
   APILoc(std::string file, unsigned line, unsigned col)
       : file(file), line(line), col(col) {}
 
-  llvm::StringRef getFilename() const { return file; }
+  StringRef getFilename() const { return file; }
   unsigned getLine() const { return line; }
   unsigned getColumn() const { return col; }
 
@@ -85,10 +86,10 @@ struct APIRecord {
   APIAccess access;
   APIAvailability availability;
 
-  APIRecord(llvm::StringRef name, APILoc loc, APILinkage linkage,
-            APIFlags flags, APIAccess access, APIAvailability availability)
-      : name(name.data(), name.size()), loc(loc), linkage(linkage), flags(flags),
-        access(access), availability(availability) {}
+  APIRecord(StringRef name, APILoc loc, APILinkage linkage, APIFlags flags,
+            APIAccess access, APIAvailability availability)
+      : name(name.data(), name.size()), loc(loc), linkage(linkage),
+        flags(flags), access(access), availability(availability) {}
 
   bool isWeakDefined() const {
     return (flags & APIFlags::WeakDefined) == APIFlags::WeakDefined;
@@ -116,9 +117,8 @@ enum class GVKind : uint8_t {
 struct GlobalRecord : APIRecord {
   GVKind kind;
 
-  GlobalRecord(llvm::StringRef name, APILoc loc, APILinkage linkage,
-               APIFlags flags, APIAccess access, GVKind kind,
-               APIAvailability availability)
+  GlobalRecord(StringRef name, APILoc loc, APILinkage linkage, APIFlags flags,
+               APIAccess access, GVKind kind, APIAvailability availability)
       : APIRecord(name, loc, linkage, flags, access, availability), kind(kind) {
   }
 };
@@ -127,7 +127,7 @@ struct ObjCMethodRecord : APIRecord {
   bool isInstanceMethod;
   bool isOptional;
 
-  ObjCMethodRecord(llvm::StringRef name, APILoc loc, APIAccess access,
+  ObjCMethodRecord(StringRef name, APILoc loc, APIAccess access,
                    bool isInstanceMethod, bool isOptional,
                    APIAvailability availability)
       : APIRecord(name, loc, APILinkage::Unknown, APIFlags::None, access,
@@ -138,16 +138,16 @@ struct ObjCMethodRecord : APIRecord {
 struct ObjCContainerRecord : APIRecord {
   std::vector<ObjCMethodRecord*> methods;
 
-  ObjCContainerRecord(llvm::StringRef name, APILinkage linkage, APILoc loc,
+  ObjCContainerRecord(StringRef name, APILinkage linkage, APILoc loc,
                       APIAccess access, const APIAvailability &availability)
       : APIRecord(name, loc, linkage, APIFlags::None, access, availability) {}
 };
 
 struct ObjCInterfaceRecord : ObjCContainerRecord {
   std::string superClassName;
-  ObjCInterfaceRecord(llvm::StringRef name, APILinkage linkage, APILoc loc,
+  ObjCInterfaceRecord(StringRef name, APILinkage linkage, APILoc loc,
                       APIAccess access, APIAvailability availability,
-                      llvm::StringRef superClassName)
+                      StringRef superClassName)
       : ObjCContainerRecord(name, linkage, loc, access, availability),
         superClassName(superClassName.data(), superClassName.size()) {}
 };
@@ -158,16 +158,16 @@ class API {
 
   const llvm::Triple &getTarget() const { return target; }
 
-  void addSymbol(llvm::StringRef symbol, APILoc loc, APILinkage linkage,
+  void addSymbol(StringRef symbol, APILoc loc, APILinkage linkage,
                  APIFlags flags, APIAccess access,
                  APIAvailability availability);
 
-  ObjCInterfaceRecord *addObjCClass(llvm::StringRef name, APILinkage linkage,
+  ObjCInterfaceRecord *addObjCClass(StringRef name, APILinkage linkage,
                                     APILoc loc, APIAccess access,
                                     APIAvailability availability,
-                                    llvm::StringRef superClassName);
+                                    StringRef superClassName);
 
-  void addObjCMethod(ObjCInterfaceRecord *cls, llvm::StringRef name, APILoc loc,
+  void addObjCMethod(ObjCInterfaceRecord *cls, StringRef name, APILoc loc,
                      APIAccess access, bool isInstanceMethod, bool isOptional,
                      APIAvailability availability);