Index: cfe/trunk/include/clang/Driver/Job.h =================================================================== --- cfe/trunk/include/clang/Driver/Job.h +++ cfe/trunk/include/clang/Driver/Job.h @@ -30,7 +30,7 @@ class Tool; // Re-export this as clang::driver::ArgStringList. -using llvm::opt::ArgStringList; +using ArgStringList = llvm::opt::ArgStringList; struct CrashReportInfo { StringRef Filename; Index: cfe/trunk/include/clang/Frontend/PCHContainerOperations.h =================================================================== --- cfe/trunk/include/clang/Frontend/PCHContainerOperations.h +++ cfe/trunk/include/clang/Frontend/PCHContainerOperations.h @@ -20,8 +20,6 @@ class raw_pwrite_stream; } -using llvm::StringRef; - namespace clang { class ASTConsumer; @@ -41,7 +39,7 @@ class PCHContainerWriter { public: virtual ~PCHContainerWriter() = 0; - virtual StringRef getFormat() const = 0; + virtual llvm::StringRef getFormat() const = 0; /// Return an ASTConsumer that can be chained with a /// PCHGenerator that produces a wrapper file format containing a @@ -61,15 +59,15 @@ public: virtual ~PCHContainerReader() = 0; /// Equivalent to the format passed to -fmodule-format= - virtual StringRef getFormat() const = 0; + virtual llvm::StringRef getFormat() const = 0; /// Returns the serialized AST inside the PCH container Buffer. - virtual StringRef ExtractPCH(llvm::MemoryBufferRef Buffer) const = 0; + virtual llvm::StringRef ExtractPCH(llvm::MemoryBufferRef Buffer) const = 0; }; /// Implements write operations for a raw pass-through PCH container. class RawPCHContainerWriter : public PCHContainerWriter { - StringRef getFormat() const override { return "raw"; } + llvm::StringRef getFormat() const override { return "raw"; } /// Return an ASTConsumer that can be chained with a /// PCHGenerator that writes the module to a flat file. @@ -83,10 +81,10 @@ /// Implements read operations for a raw pass-through PCH container. class RawPCHContainerReader : public PCHContainerReader { - StringRef getFormat() const override { return "raw"; } + llvm::StringRef getFormat() const override { return "raw"; } /// Simply returns the buffer contained in Buffer. - StringRef ExtractPCH(llvm::MemoryBufferRef Buffer) const override; + llvm::StringRef ExtractPCH(llvm::MemoryBufferRef Buffer) const override; }; /// A registry of PCHContainerWriter and -Reader objects for different formats. @@ -103,10 +101,10 @@ void registerReader(std::unique_ptr Reader) { Readers[Reader->getFormat()] = std::move(Reader); } - const PCHContainerWriter *getWriterOrNull(StringRef Format) { + const PCHContainerWriter *getWriterOrNull(llvm::StringRef Format) { return Writers[Format].get(); } - const PCHContainerReader *getReaderOrNull(StringRef Format) { + const PCHContainerReader *getReaderOrNull(llvm::StringRef Format) { return Readers[Format].get(); } const PCHContainerReader &getRawReader() { Index: cfe/trunk/include/clang/Serialization/GlobalModuleIndex.h =================================================================== --- cfe/trunk/include/clang/Serialization/GlobalModuleIndex.h +++ cfe/trunk/include/clang/Serialization/GlobalModuleIndex.h @@ -42,11 +42,6 @@ class ModuleFile; } -using llvm::SmallVector; -using llvm::SmallVectorImpl; -using llvm::StringRef; -using serialization::ModuleFile; - /// A global index for a set of module files, providing information about /// the identifiers within those module files. /// @@ -59,6 +54,8 @@ /// imported, and can be queried to determine which modules the current /// translation could or should load to fix a problem. class GlobalModuleIndex { + using ModuleFile = serialization::ModuleFile; + /// Buffer containing the index file, which is lazily accessed so long /// as the global module index is live. std::unique_ptr Buffer; @@ -147,7 +144,7 @@ /// \returns A pair containing the global module index (if it exists) and /// the error code. static std::pair - readIndex(StringRef Path); + readIndex(llvm::StringRef Path); /// Returns an iterator for identifiers stored in the index table. /// @@ -158,12 +155,12 @@ /// /// \param ModuleFiles Will be populated with the set of module files that /// have been indexed. - void getKnownModules(SmallVectorImpl &ModuleFiles); + void getKnownModules(llvm::SmallVectorImpl &ModuleFiles); /// Retrieve the set of module files on which the given module file /// directly depends. void getModuleDependencies(ModuleFile *File, - SmallVectorImpl &Dependencies); + llvm::SmallVectorImpl &Dependencies); /// A set of module files in which we found a result. typedef llvm::SmallPtrSet HitSet; @@ -177,7 +174,7 @@ /// information about this name. /// /// \returns true if the identifier is known to the index, false otherwise. - bool lookupIdentifier(StringRef Name, HitSet &Hits); + bool lookupIdentifier(llvm::StringRef Name, HitSet &Hits); /// Note that the given module file has been loaded. /// @@ -200,7 +197,7 @@ /// which the global index will be written. static ErrorCode writeIndex(FileManager &FileMgr, const PCHContainerReader &PCHContainerRdr, - StringRef Path); + llvm::StringRef Path); }; } Index: cfe/trunk/lib/Frontend/FrontendAction.cpp =================================================================== --- cfe/trunk/lib/Frontend/FrontendAction.cpp +++ cfe/trunk/lib/Frontend/FrontendAction.cpp @@ -568,7 +568,7 @@ auto &MM = ASTReader->getModuleManager(); auto &PrimaryModule = MM.getPrimaryModule(); - for (ModuleFile &MF : MM) + for (serialization::ModuleFile &MF : MM) if (&MF != &PrimaryModule) CI.getFrontendOpts().ModuleFiles.push_back(MF.FileName); Index: cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.h =================================================================== --- cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.h +++ cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.h @@ -45,8 +45,6 @@ #include #include -using llvm::StrInStrNoCase; - namespace clang { namespace ento { namespace retaincountchecker { Index: cfe/trunk/utils/TableGen/TableGenBackends.h =================================================================== --- cfe/trunk/utils/TableGen/TableGenBackends.h +++ cfe/trunk/utils/TableGen/TableGenBackends.h @@ -23,63 +23,60 @@ class RecordKeeper; } -using llvm::raw_ostream; -using llvm::RecordKeeper; - namespace clang { -void EmitClangDeclContext(RecordKeeper &RK, raw_ostream &OS); -void EmitClangASTNodes(RecordKeeper &RK, raw_ostream &OS, +void EmitClangDeclContext(llvm::RecordKeeper &RK, llvm::raw_ostream &OS); +void EmitClangASTNodes(llvm::RecordKeeper &RK, llvm::raw_ostream &OS, const std::string &N, const std::string &S); -void EmitClangAttrParserStringSwitches(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrSubjectMatchRulesParserStringSwitches(RecordKeeper &Records, - raw_ostream &OS); -void EmitClangAttrClass(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrImpl(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrList(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrSubjectMatchRuleList(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrPCHRead(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrPCHWrite(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrHasAttrImpl(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrSpellingListIndex(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrASTVisitor(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrTemplateInstantiate(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrParsedAttrList(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrParsedAttrImpl(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrParsedAttrKinds(RecordKeeper &Records, raw_ostream &OS); -void EmitClangAttrDump(RecordKeeper &Records, raw_ostream &OS); +void EmitClangAttrParserStringSwitches(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrSubjectMatchRulesParserStringSwitches(llvm::RecordKeeper &Records, + llvm::raw_ostream &OS); +void EmitClangAttrClass(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrImpl(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrList(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrSubjectMatchRuleList(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrPCHRead(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrPCHWrite(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrHasAttrImpl(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrSpellingListIndex(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrASTVisitor(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrTemplateInstantiate(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrParsedAttrList(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrParsedAttrImpl(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrParsedAttrKinds(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangAttrDump(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitClangDiagsDefs(RecordKeeper &Records, raw_ostream &OS, +void EmitClangDiagsDefs(llvm::RecordKeeper &Records, llvm::raw_ostream &OS, const std::string &Component); -void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS); -void EmitClangDiagsIndexName(RecordKeeper &Records, raw_ostream &OS); +void EmitClangDiagGroups(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangDiagsIndexName(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitClangSACheckers(RecordKeeper &Records, raw_ostream &OS); +void EmitClangSACheckers(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitClangCommentHTMLTags(RecordKeeper &Records, raw_ostream &OS); -void EmitClangCommentHTMLTagsProperties(RecordKeeper &Records, raw_ostream &OS); -void EmitClangCommentHTMLNamedCharacterReferences(RecordKeeper &Records, raw_ostream &OS); - -void EmitClangCommentCommandInfo(RecordKeeper &Records, raw_ostream &OS); -void EmitClangCommentCommandList(RecordKeeper &Records, raw_ostream &OS); - -void EmitNeon(RecordKeeper &Records, raw_ostream &OS); -void EmitFP16(RecordKeeper &Records, raw_ostream &OS); -void EmitNeonSema(RecordKeeper &Records, raw_ostream &OS); -void EmitNeonTest(RecordKeeper &Records, raw_ostream &OS); -void EmitNeon2(RecordKeeper &Records, raw_ostream &OS); -void EmitNeonSema2(RecordKeeper &Records, raw_ostream &OS); -void EmitNeonTest2(RecordKeeper &Records, raw_ostream &OS); - -void EmitClangAttrDocs(RecordKeeper &Records, raw_ostream &OS); -void EmitClangDiagDocs(RecordKeeper &Records, raw_ostream &OS); -void EmitClangOptDocs(RecordKeeper &Records, raw_ostream &OS); +void EmitClangCommentHTMLTags(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangCommentHTMLTagsProperties(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangCommentHTMLNamedCharacterReferences(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); + +void EmitClangCommentCommandInfo(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangCommentCommandList(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); + +void EmitNeon(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitFP16(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitNeonSema(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitNeonTest(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitNeon2(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitNeonSema2(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitNeonTest2(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); + +void EmitClangAttrDocs(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangDiagDocs(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitClangOptDocs(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitClangDataCollectors(RecordKeeper &Records, raw_ostream &OS); +void EmitClangDataCollectors(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitTestPragmaAttributeSupportedAttributes(RecordKeeper &Records, - raw_ostream &OS); +void EmitTestPragmaAttributeSupportedAttributes(llvm::RecordKeeper &Records, + llvm::raw_ostream &OS); } // end namespace clang