diff options
54 files changed, 159 insertions, 164 deletions
diff --git a/clang/include/clang/AST/APValue.h b/clang/include/clang/AST/APValue.h index 5c8c99d85d3..375af28f0c5 100644 --- a/clang/include/clang/AST/APValue.h +++ b/clang/include/clang/AST/APValue.h @@ -14,6 +14,7 @@ #ifndef LLVM_CLANG_AST_APVALUE_H #define LLVM_CLANG_AST_APVALUE_H +#include "clang/Basic/LLVM.h" #include "llvm/ADT/APSInt.h" #include "llvm/ADT/APFloat.h" @@ -104,7 +105,7 @@ public: bool isLValue() const { return Kind == LValue; } bool isVector() const { return Kind == Vector; } - void print(llvm::raw_ostream &OS) const; + void print(raw_ostream &OS) const; void dump() const; APSInt &getInt() { @@ -234,7 +235,7 @@ private: void MakeLValue(); }; -inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const APValue &V) { +inline raw_ostream &operator<<(raw_ostream &OS, const APValue &V) { V.print(OS); return OS; } diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h index ba538e96ec5..c2b3d9fe6ea 100644 --- a/clang/include/clang/AST/ASTContext.h +++ b/clang/include/clang/AST/ASTContext.h @@ -1145,7 +1145,7 @@ public: const ASTRecordLayout &getASTObjCInterfaceLayout(const ObjCInterfaceDecl *D) const; - void DumpRecordLayout(const RecordDecl *RD, llvm::raw_ostream &OS) const; + void DumpRecordLayout(const RecordDecl *RD, raw_ostream &OS) const; /// getASTObjCImplementationLayout - Get or compute information about /// the layout of the specified Objective-C implementation. This may diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h index 4418f778279..938de814e28 100644 --- a/clang/include/clang/AST/Decl.h +++ b/clang/include/clang/AST/Decl.h @@ -132,7 +132,7 @@ public: // FIXME: Deprecated, move clients to getName(). std::string getNameAsString() const { return Name.getAsString(); } - void printName(llvm::raw_ostream &os) const { return Name.printName(os); } + void printName(raw_ostream &os) const { return Name.printName(os); } /// getDeclName - Get the actual, stored name of the declaration, /// which may be a special name. @@ -294,7 +294,7 @@ public: static bool classofKind(Kind K) { return K >= firstNamed && K <= lastNamed; } }; -inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, +inline raw_ostream &operator<<(raw_ostream &OS, const NamedDecl *ND) { ND->getDeclName().printName(OS); return OS; diff --git a/clang/include/clang/AST/DeclBase.h b/clang/include/clang/AST/DeclBase.h index d698775e19a..8ba94525cca 100644 --- a/clang/include/clang/AST/DeclBase.h +++ b/clang/include/clang/AST/DeclBase.h @@ -734,15 +734,15 @@ public: static DeclContext *castToDeclContext(const Decl *); static Decl *castFromDeclContext(const DeclContext *); - void print(llvm::raw_ostream &Out, unsigned Indentation = 0) const; - void print(llvm::raw_ostream &Out, const PrintingPolicy &Policy, + void print(raw_ostream &Out, unsigned Indentation = 0) const; + void print(raw_ostream &Out, const PrintingPolicy &Policy, unsigned Indentation = 0) const; static void printGroup(Decl** Begin, unsigned NumDecls, - llvm::raw_ostream &Out, const PrintingPolicy &Policy, + raw_ostream &Out, const PrintingPolicy &Policy, unsigned Indentation = 0); void dump() const; void dumpXML() const; - void dumpXML(llvm::raw_ostream &OS) const; + void dumpXML(raw_ostream &OS) const; private: const Attr *getAttrsImpl() const; @@ -763,7 +763,7 @@ public: SourceManager &sm, const char *Msg) : TheDecl(theDecl), Loc(L), SM(sm), Message(Msg) {} - virtual void print(llvm::raw_ostream &OS) const; + virtual void print(raw_ostream &OS) const; }; class DeclContextLookupResult diff --git a/clang/include/clang/AST/DeclObjC.h b/clang/include/clang/AST/DeclObjC.h index a0496aac925..3c3983677da 100644 --- a/clang/include/clang/AST/DeclObjC.h +++ b/clang/include/clang/AST/DeclObjC.h @@ -1228,7 +1228,7 @@ public: static bool classofKind(Kind K) { return K == ObjCCategoryImpl;} }; -llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, +raw_ostream &operator<<(raw_ostream &OS, const ObjCCategoryImplDecl *CID); /// ObjCImplementationDecl - Represents a class definition - this is where @@ -1368,7 +1368,7 @@ public: friend class ASTDeclWriter; }; -llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, +raw_ostream &operator<<(raw_ostream &OS, const ObjCImplementationDecl *ID); /// ObjCCompatibleAliasDecl - Represents alias of a class. This alias is diff --git a/clang/include/clang/AST/DeclarationName.h b/clang/include/clang/AST/DeclarationName.h index bb098313ea3..7c670c47415 100644 --- a/clang/include/clang/AST/DeclarationName.h +++ b/clang/include/clang/AST/DeclarationName.h @@ -203,7 +203,7 @@ public: std::string getAsString() const; /// printName - Print the human-readable name to a stream. - void printName(llvm::raw_ostream &OS) const; + void printName(raw_ostream &OS) const; /// getAsIdentifierInfo - Retrieve the IdentifierInfo * stored in /// this declaration name, or NULL if this declaration name isn't a @@ -503,7 +503,7 @@ public: std::string getAsString() const; /// printName - Print the human-readable name to a stream. - void printName(llvm::raw_ostream &OS) const; + void printName(raw_ostream &OS) const; /// getBeginLoc - Retrieve the location of the first token. SourceLocation getBeginLoc() const { return NameLoc; } @@ -533,7 +533,7 @@ inline const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, return PD; } -inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, +inline raw_ostream &operator<<(raw_ostream &OS, DeclarationNameInfo DNInfo) { DNInfo.printName(OS); return OS; diff --git a/clang/include/clang/AST/Mangle.h b/clang/include/clang/AST/Mangle.h index e7a8e320970..d40e101b2b3 100644 --- a/clang/include/clang/AST/Mangle.h +++ b/clang/include/clang/AST/Mangle.h @@ -95,46 +95,46 @@ public: /// @{ virtual bool shouldMangleDeclName(const NamedDecl *D) = 0; - virtual void mangleName(const NamedDecl *D, llvm::raw_ostream &)=0; + virtual void mangleName(const NamedDecl *D, raw_ostream &)=0; virtual void mangleThunk(const CXXMethodDecl *MD, const ThunkInfo &Thunk, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; virtual void mangleCXXDtorThunk(const CXXDestructorDecl *DD, CXXDtorType Type, const ThisAdjustment &ThisAdjustment, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; virtual void mangleReferenceTemporary(const VarDecl *D, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; virtual void mangleCXXVTable(const CXXRecordDecl *RD, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; virtual void mangleCXXVTT(const CXXRecordDecl *RD, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; virtual void mangleCXXCtorVTable(const CXXRecordDecl *RD, int64_t Offset, const CXXRecordDecl *Type, - llvm::raw_ostream &) = 0; - virtual void mangleCXXRTTI(QualType T, llvm::raw_ostream &) = 0; - virtual void mangleCXXRTTIName(QualType T, llvm::raw_ostream &) = 0; + raw_ostream &) = 0; + virtual void mangleCXXRTTI(QualType T, raw_ostream &) = 0; + virtual void mangleCXXRTTIName(QualType T, raw_ostream &) = 0; virtual void mangleCXXCtor(const CXXConstructorDecl *D, CXXCtorType Type, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; virtual void mangleCXXDtor(const CXXDestructorDecl *D, CXXDtorType Type, - llvm::raw_ostream &) = 0; + raw_ostream &) = 0; void mangleGlobalBlock(const BlockDecl *BD, - llvm::raw_ostream &Out); + raw_ostream &Out); void mangleCtorBlock(const CXXConstructorDecl *CD, CXXCtorType CT, - const BlockDecl *BD, llvm::raw_ostream &Out); + const BlockDecl *BD, raw_ostream &Out); void mangleDtorBlock(const CXXDestructorDecl *CD, CXXDtorType DT, - const BlockDecl *BD, llvm::raw_ostream &Out); + const BlockDecl *BD, raw_ostream &Out); void mangleBlock(const DeclContext *DC, const BlockDecl *BD, - llvm::raw_ostream &Out); + raw_ostream &Out); // Do the right thing. - void mangleBlock(const BlockDecl *BD, llvm::raw_ostream &Out); + void mangleBlock(const BlockDecl *BD, raw_ostream &Out); void mangleObjCMethodName(const ObjCMethodDecl *MD, - llvm::raw_ostream &); + raw_ostream &); // This is pretty lame. virtual void mangleItaniumGuardVariable(const VarDecl *D, - llvm::raw_ostream &) { + raw_ostream &) { assert(0 && "Target does not support mangling guard variables"); } /// @} diff --git a/clang/include/clang/AST/NestedNameSpecifier.h b/clang/include/clang/AST/NestedNameSpecifier.h index 018041f8ba2..ae65d00dd7d 100644 --- a/clang/include/clang/AST/NestedNameSpecifier.h +++ b/clang/include/clang/AST/NestedNameSpecifier.h @@ -196,7 +196,7 @@ public: /// \brief Print this nested name specifier to the given output /// stream. - void print(llvm::raw_ostream &OS, const PrintingPolicy &Policy) const; + void print(raw_ostream &OS, const PrintingPolicy &Policy) const; void Profile(llvm::FoldingSetNodeID &ID) const { ID.AddPointer(Prefix.getOpaqueValue()); diff --git a/clang/include/clang/AST/PrettyPrinter.h b/clang/include/clang/AST/PrettyPrinter.h index fc8ac36b3b9..a5ffd3764e9 100644 --- a/clang/include/clang/AST/PrettyPrinter.h +++ b/clang/include/clang/AST/PrettyPrinter.h @@ -29,7 +29,7 @@ class LangOptions; class PrinterHelper { public: virtual ~PrinterHelper(); - virtual bool handledStmt(Stmt* E, llvm::raw_ostream& OS) = 0; + virtual bool handledStmt(Stmt* E, raw_ostream& OS) = 0; }; /// \brief Describes how types, statements, expressions, and diff --git a/clang/include/clang/AST/Stmt.h b/clang/include/clang/AST/Stmt.h index cca59509d22..08391d7a24a 100644 --- a/clang/include/clang/AST/Stmt.h +++ b/clang/include/clang/AST/Stmt.h @@ -269,7 +269,7 @@ public: /// This is useful in a debugger. void dump() const; void dump(SourceManager &SM) const; - void dump(llvm::raw_ostream &OS, SourceManager &SM) const; + void dump(raw_ostream &OS, SourceManager &SM) const; /// dumpAll - This does a dump of the specified AST fragment and all subtrees. void dumpAll() const; @@ -278,12 +278,12 @@ public: /// dumpPretty/printPretty - These two methods do a "pretty print" of the AST /// back to its original source language syntax. void dumpPretty(ASTContext& Context) const; - void printPretty(llvm::raw_ostream &OS, PrinterHelper *Helper, + void printPretty(raw_ostream &OS, PrinterHelper *Helper, const PrintingPolicy &Policy, unsigned Indentation = 0) const { printPretty(OS, *(ASTContext*)0, Helper, Policy, Indentation); } - void printPretty(llvm::raw_ostream &OS, ASTContext &Context, + void printPretty(raw_ostream &OS, ASTContext &Context, PrinterHelper *Helper, const PrintingPolicy &Policy, unsigned Indentation = 0) const; diff --git a/clang/include/clang/AST/TemplateBase.h b/clang/include/clang/AST/TemplateBase.h index 9412ec81520..a9b6cad048a 100644 --- a/clang/include/clang/AST/TemplateBase.h +++ b/clang/include/clang/AST/TemplateBase.h @@ -354,7 +354,7 @@ public: TemplateArgument getPackExpansionPattern() const; /// \brief Print this template argument to the given output stream. - void print(const PrintingPolicy &Policy, llvm::raw_ostream &Out) const; + void print(const PrintingPolicy &Policy, raw_ostream &Out) const; /// \brief Used to insert TemplateArguments into FoldingSets. void Profile(llvm::FoldingSetNodeID &ID, const ASTContext &Context) const; diff --git a/clang/include/clang/AST/TemplateName.h b/clang/include/clang/AST/TemplateName.h index a180f587edd..7dc75b19257 100644 --- a/clang/include/clang/AST/TemplateName.h +++ b/clang/include/clang/AST/TemplateName.h @@ -14,14 +14,11 @@ #ifndef LLVM_CLANG_AST_TEMPLATENAME_H #define LLVM_CLANG_AST_TEMPLATENAME_H +#include "clang/Basic/LLVM.h" #include "llvm/ADT/FoldingSet.h" #include "llvm/ADT/PointerUnion.h" #include "clang/Basic/OperatorKinds.h" -namespace llvm { - class raw_ostream; -} - namespace clang { class ASTContext; @@ -308,7 +305,7 @@ public: /// \param SuppressNNS if true, don't print the /// nested-name-specifier that precedes the template name (if it has /// one). - void print(llvm::raw_ostream &OS, const PrintingPolicy &Policy, + void print(raw_ostream &OS, const PrintingPolicy &Policy, bool SuppressNNS = false) const; /// \brief Debugging aid that dumps the template name to standard diff --git a/clang/include/clang/Analysis/Analyses/FormatString.h b/clang/include/clang/Analysis/Analyses/FormatString.h index 36d37ad95ae..61f41644720 100644 --- a/clang/include/clang/Analysis/Analyses/FormatString.h +++ b/clang/include/clang/Analysis/Analyses/FormatString.h @@ -271,7 +271,7 @@ public: ArgTypeResult getArgType(ASTContext &Ctx) const; - void toString(llvm::raw_ostream &os) const; + void toString(raw_ostream &os) const; bool usesPositionalArg() const { return (bool) UsesPositionalArg; } unsigned getPositionalArgIndex() const { @@ -465,7 +465,7 @@ public: /// was not successful. bool fixType(QualType QT); - void toString(llvm::raw_ostream &os) const; + void toString(raw_ostream &os) const; // Validation methods - to check if any element results in undefined behavior bool hasValidPlusPrefix() const; diff --git a/clang/include/clang/Analysis/CFG.h b/clang/include/clang/Analysis/CFG.h index 83f5b1549eb..ec3fa779a60 100644 --- a/clang/include/clang/Analysis/CFG.h +++ b/clang/include/clang/Analysis/CFG.h @@ -478,8 +478,8 @@ public: unsigned getBlockID() const { return BlockID; } void dump(const CFG *cfg, const LangOptions &LO) const; - void print(llvm::raw_ostream &OS, const CFG* cfg, const LangOptions &LO) const; - void printTerminator(llvm::raw_ostream &OS, const LangOptions &LO) const; + void print(raw_ostream &OS, const CFG* cfg, const LangOptions &LO) const; + void printTerminator(raw_ostream &OS, const LangOptions &LO) const; void addSuccessor(CFGBlock* Block, BumpVectorContext &C) { if (Block) @@ -652,7 +652,7 @@ public: //===--------------------------------------------------------------------===// void viewCFG(const LangOptions &LO) const; - void print(llvm::raw_ostream& OS, const LangOptions &LO) const; + void print(raw_ostream& OS, const LangOptions &LO) const; void dump(const LangOptions &LO) const; //===--------------------------------------------------------------------===// diff --git a/clang/include/clang/Basic/LLVM.h b/clang/include/clang/Basic/LLVM.h index a4aaa2f8909..7df59369643 100644 --- a/clang/include/clang/Basic/LLVM.h +++ b/clang/include/clang/Basic/LLVM.h @@ -22,10 +22,12 @@ namespace llvm { // ADT's. class StringRef; + class Twine; template<typename T, unsigned N> class SmallVector; template<typename T> class SmallVectorImpl; - - // TODO: Twine, raw_ostream, DenseMap, ... + + class raw_ostream; + // TODO: DenseMap, ... } @@ -37,10 +39,13 @@ namespace clang { using llvm::dyn_cast_or_null; using llvm::cast_or_null; + // ADT's. using llvm::StringRef; + using llvm::Twine; using llvm::SmallVector; using llvm::SmallVectorImpl; + using llvm::raw_ostream; } // end namespace clang. #endif diff --git a/clang/include/clang/Basic/MacroBuilder.h b/clang/include/clang/Basic/MacroBuilder.h index 3287b304c97..1d0f1e899c9 100644 --- a/clang/include/clang/Basic/MacroBuilder.h +++ b/clang/include/clang/Basic/MacroBuilder.h @@ -20,23 +20,23 @@ namespace clang { class MacroBuilder { - llvm::raw_ostream &Out; + raw_ostream &Out; public: - MacroBuilder(llvm::raw_ostream &Output) : Out(Output) {} + MacroBuilder(raw_ostream &Output) : Out(Output) {} /// Append a #define line for macro of the form "#define Name Value\n". - void defineMacro(const llvm::Twine &Name, const llvm::Twine &Value = "1") { + void defineMacro(const Twine &Name, const Twine &Value = "1") { Out << "#define " << Name << ' ' << Value << '\n'; } /// Append a #undef line for Name. Name should be of the form XXX /// and we emit "#undef XXX". - void undefineMacro(const llvm::Twine &Name) { + void undefineMacro(const Twine &Name) { Out << "#undef " << Name << '\n'; } /// Directly append Str and a newline to the underlying buffer. - void append(const llvm::Twine &Str) { + void append(const Twine &Str) { Out << Str << '\n'; } }; diff --git a/clang/include/clang/Basic/OnDiskHashTable.h b/clang/include/clang/Basic/OnDiskHashTable.h index 267ecbcd6df..3705a8941e0 100644 --- a/clang/include/clang/Basic/OnDiskHashTable.h +++ b/clang/include/clang/Basic/OnDiskHashTable.h @@ -28,31 +28,31 @@ namespace io { typedef uint32_t Offset; -inline void Emit8(llvm::raw_ostream& Out, uint32_t V) { +inline void Emit8(raw_ostream& Out, uint32_t V) { Out << (unsigned char)(V); } -inline void Emit16(llvm::raw_ostream& Out, uint32_t V) { +inline void Emit16(raw_ostream& Out, uint32_t V) { Out << (unsigned char)(V); Out << (unsigned char)(V >> 8); assert((V >> 16) == 0); } -inline void Emit24(llvm::raw_ostream& Out, uint32_t V) { +inline void Emit24(raw_ostream& Out, uint32_t V) { Out << (unsigned char)(V); Out << (unsigned char)(V >> 8); Out << (unsigned char)(V >> 16); assert((V >> 24) == 0); } -inline void Emit32(llvm::raw_ostream& Out, uint32_t V) { +inline void Emit32(raw_ostream& Out, uint32_t V) { Out << (unsigned char)(V); Out << (unsigned char)(V >> 8); Out << (unsigned char)(V >> 16); Out << (unsigned char)(V >> 24); } -inline void Emit64(llvm::raw_ostream& Out, uint64_t V) { +inline void Emit64(raw_ostream& Out, uint64_t V) { Out << (unsigned char)(V); Out << (unsigned char)(V >> 8); Out << (unsigned char)(V >> 16); @@ -63,7 +63,7 @@ inline void Emit64(llvm::raw_ostream& Out, uint64_t V) { Out << (unsigned char)(V >> 56); } -inline void Pad(llvm::raw_ostream& Out, unsigned A) { +inline void Pad(raw_ostream& Out, unsigned A) { Offset off = (Offset) Out.tell(); uint32_t n = ((uintptr_t)(off+A-1) & ~(uintptr_t)(A-1)) - off; for (; n ; --n) @@ -182,12 +182,12 @@ public: InfoObj)); } - io::Offset Emit(llvm::raw_ostream &out) { + io::Offset Emit(raw_ostream &out) { Info InfoObj; return Emit(out, InfoObj); } - io::Offset Emit(llvm::raw_ostream &out, Info &InfoObj) { + io::Offset Emit(raw_ostream &out, Info &InfoObj) { using namespace clang::io; // Emit the payload of the table. diff --git a/clang/include/clang/Basic/PrettyStackTrace.h b/clang/include/clang/Basic/PrettyStackTrace.h index 5a5d55192b6..06a12644c36 100644 --- a/clang/include/clang/Basic/PrettyStackTrace.h +++ b/clang/include/clang/Basic/PrettyStackTrace.h @@ -30,7 +30,7 @@ namespace clang { public: PrettyStackTraceLoc(SourceManager &sm, SourceLocation L, const char *Msg) : SM(sm), Loc(L), Message(Msg) {} - virtual void print(llvm::raw_ostream &OS) const; + virtual void print(raw_ostream &OS) const; }; } diff --git a/clang/include/clang/Basic/SourceLocation.h b/clang/include/clang/Basic/SourceLocation.h index 5e3fe0c0c92..3a4780c20dc 100644 --- a/clang/include/clang/Basic/SourceLocation.h +++ b/clang/include/clang/Basic/SourceLocation.h @@ -164,7 +164,7 @@ public: return getFromRawEncoding((unsigned)(uintptr_t)Encoding); } - void print(llvm::raw_ostream &OS, const SourceManager &SM) const; + void print(raw_ostream &OS, const SourceManager &SM) const; void dump(const SourceManager &SM) const; }; diff --git a/clang/include/clang/Basic/VersionTuple.h b/clang/include/clang/Basic/VersionTuple.h index 91eb68eaad9..30ef6641efc 100644 --- a/clang/include/clang/Basic/VersionTuple.h +++ b/clang/include/clang/Basic/VersionTuple.h @@ -14,13 +14,10 @@ #ifndef LLVM_CLANG_BASIC_VERSIONTUPLE_H #define LLVM_CLANG_BASIC_VERSIONTUPLE_H +#include "clang/Basic/LLVM.h" #include "llvm/ADT/Optional.h" #include <string> -namespace llvm { - class raw_ostream; -} - namespace clang { /// \brief Represents a version number in the form major[.minor[.subminor]]. @@ -120,7 +117,7 @@ public: }; /// \brief Print a version number. -llvm::raw_ostream& operator<<(llvm::raw_ostream &Out, const VersionTuple &V); +raw_ostream& operator<<(raw_ostream &Out, const VersionTuple &V); } // end namespace clang #endif // LLVM_CLANG_BASIC_VERSIONTUPLE_H diff --git a/clang/include/clang/CodeGen/BackendUtil.h b/clang/include/clang/CodeGen/BackendUtil.h index 9636d6e527c..5003d675b6d 100644 --- a/clang/include/clang/CodeGen/BackendUtil.h +++ b/clang/include/clang/CodeGen/BackendUtil.h @@ -10,9 +10,10 @@ #ifndef LLVM_CLANG_CODEGEN_BACKEND_UTIL_H #define LLVM_CLANG_CODEGEN_BACKEND_UTIL_H +#include "clang/Basic/LLVM.h" + namespace llvm { class Module; - class raw_ostream; } namespace clang { @@ -33,7 +34,7 @@ namespace clang { void EmitBackendOutput(Diagnostic &Diags, const CodeGenOptions &CGOpts, const TargetOptions &TOpts, const LangOptions &LOpts, llvm::Module *M, - BackendAction Action, llvm::raw_ostream *OS); + BackendAction Action, raw_ostream *OS); } #endif diff --git a/clang/include/clang/Driver/ArgList.h b/clang/include/clang/Driver/ArgList.h index 4710468b34c..8a37915904f 100644 --- a/clang/include/clang/Driver/ArgList.h +++ b/clang/include/clang/Driver/ArgList.h @@ -259,7 +259,7 @@ namespace driver { const char *MakeArgString(std::string Str) const { return MakeArgString(StringRef(Str)); } - const char *MakeArgString(const llvm::Twine &Str) const; + const char *MakeArgString(const Twine &Str) const; /// \brief Create an arg string for (\arg LHS + \arg RHS), reusing the /// string at \arg Index if possible. diff --git a/clang/include/clang/Driver/Compilation.h b/clang/include/clang/Driver/Compilation.h index 2db712d9321..64ca32f78e2 100644 --- a/clang/include/clang/Driver/Compilation.h +++ b/clang/include/clang/Driver/Compilation.h @@ -120,7 +120,7 @@ public: /// \param J - The job to print. /// \param Terminator - A string to print at the end of the line. /// \param Quote - Should separate arguments be quoted. - void PrintJob(llvm::raw_ostream &OS, const Job &J, + void PrintJob(raw_ostream &OS, const Job &J, const char *Terminator, bool Quote) const; /// ExecuteCommand - Execute an actual command. diff --git a/clang/include/clang/Driver/Driver.h b/clang/include/clang/Driver/Driver.h index 28ea7e9e342..4c6467ac911 100644 --- a/clang/include/clang/Driver/Driver.h +++ b/clang/include/clang/Driver/Driver.h @@ -281,7 +281,7 @@ public: void PrintOptions(const ArgList &Args) const; /// PrintVersion - Print the driver version. - void PrintVersion(const Compilation &C, llvm::raw_ostream &OS) const; + void PrintVersion(const Compilation &C, raw_ostream &OS) const; /// GetFilePath - Lookup \arg Name in the list of file search paths. /// diff --git a/clang/include/clang/Driver/OptTable.h b/clang/include/clang/Driver/OptTable.h index 3befe1defba..abd224db449 100644 --- a/clang/include/clang/Driver/OptTable.h +++ b/clang/include/clang/Driver/OptTable.h @@ -10,12 +10,8 @@ #ifndef CLANG_DRIVER_OPTTABLE_H #define CLANG_DRIVER_OPTTABLE_H +#include "clang/Basic/LLVM.h" #include "clang/Driver/OptSpecifier.h" -#include <cassert> - -namespace llvm { - class raw_ostream; -} namespace clang { namespace driver { @@ -181,7 +177,7 @@ namespace options { /// \param Name - The name to use in the usage line. /// \param Title - The title to use in the usage line. /// \param ShowHidden - Whether help-hidden arguments should be shown. - void PrintHelp(llvm::raw_ostream &OS, const char *Name, + void PrintHelp(raw_ostream &OS, const char *Name, const char *Title, bool ShowHidden = false) const; }; } diff --git a/clang/include/clang/Frontend/ASTConsumers.h b/clang/include/clang/Frontend/ASTConsumers.h index 3c05834ad6a..dd6dd9ddb68 100644 --- a/clang/include/clang/Frontend/ASTConsumers.h +++ b/clang/include/clang/Frontend/ASTConsumers.h @@ -14,8 +14,9 @@ #ifndef DRIVER_ASTCONSUMERS_H #define DRIVER_ASTCONSUMERS_H +#include "clang/Basic/LLVM.h" + namespace llvm { - class raw_ostream; namespace sys { class Path; } } namespace clang { @@ -32,7 +33,7 @@ class TargetOptions; // original C code. The output is intended to be in a format such that // clang could re-parse the output back into the same AST, but the // implementation is still incomplete. -ASTConsumer *CreateASTPrinter(llvm::raw_ostream *OS); +ASTConsumer *CreateASTPrinter(raw_ostream *OS); // AST dumper: dumps the raw AST in human-readable form to stderr; this is // intended for debugging. @@ -40,7 +41,7 @@ ASTConsumer *CreateASTDumper(); // AST XML-dumper: dumps out the AST to stderr in a very detailed XML // format; this is intended for particularly intense debugging. -ASTConsumer *CreateASTDumperXML(llvm::raw_ostream &OS); +ASTConsumer *CreateASTDumperXML(raw_ostream &OS); // Graphical AST viewer: for each function definition, creates a graph of // the AST and displays it with the graph viewer "dotty". Also outputs diff --git a/clang/include/clang/Frontend/ASTUnit.h b/clang/include/clang/Frontend/ASTUnit.h index 17e91ed7204..6a3f9d5d422 100644 --- a/clang/include/clang/Frontend/ASTUnit.h +++ b/clang/include/clang/Frontend/ASTUnit.h @@ -687,7 +687,7 @@ public: /// \brief Serialize this translation unit with the given output stream. /// /// \returns True if an error occurred, false otherwise. - bool serialize(llvm::raw_ostream &OS); + bool serialize(raw_ostream &OS); }; } // namespace clang diff --git a/clang/include/clang/Frontend/CompilerInstance.h b/clang/include/clang/Frontend/CompilerInstance.h index 75c2bf2f14c..66ace650daa 100644 --- a/clang/include/clang/Frontend/CompilerInstance.h +++ b/clang/include/clang/Frontend/CompilerInstance.h @@ -102,10 +102,10 @@ class CompilerInstance { struct OutputFile { std::string Filename; std::string TempFilename; - llvm::raw_ostream *OS; + raw_ostream *OS; OutputFile(const std::string &filename, const std::string &tempFilename, - llvm::raw_ostream *os) + raw_ostream *os) : Filename(filename), TempFilename(tempFilename), OS(os) { } }; @@ -546,7 +546,7 @@ public: unsigned Line, unsigned Column, bool ShowMacros, bool ShowCodePatterns, bool ShowGlobals, - llvm::raw_ostream &OS); + raw_ostream &OS); /// \brief Create the Sema object to be used for parsing. void createSema(bool CompleteTranslationUnit, diff --git a/clang/include/clang/Frontend/FrontendActions.h b/clang/include/clang/Frontend/FrontendActions.h index 9f9476a927f..646ee2552a4 100644 --- a/clang/include/clang/Frontend/FrontendActions.h +++ b/clang/include/clang/Frontend/FrontendActions.h @@ -84,7 +84,7 @@ public: StringRef InFile, std::string &Sysroot, std::string &OutputFile, - llvm::raw_ostream *&OS, + raw_ostream *&OS, bool &Chaining); }; diff --git a/clang/include/clang/Frontend/LogDiagnosticPrinter.h b/clang/include/clang/Frontend/LogDiagnosticPrinter.h index fbed15b7410..ee53a71d2f8 100644 --- a/clang/include/clang/Frontend/LogDiagnosticPrinter.h +++ b/clang/include/clang/Frontend/LogDiagnosticPrinter.h @@ -40,7 +40,7 @@ class LogDiagnosticPrinter : public DiagnosticClient { Diagnostic::Level DiagnosticLevel; }; - llvm::raw_ostream &OS; + raw_ostream &OS; const LangOptions *LangOpts; const DiagnosticOptions *DiagOpts; @@ -54,7 +54,7 @@ class LogDiagnosticPrinter : public DiagnosticClient { std::string DwarfDebugFlags; public: - LogDiagnosticPrinter(llvm::raw_ostream &OS, const DiagnosticOptions &Diags, + LogDiagnosticPrinter(raw_ostream &OS, const DiagnosticOptions &Diags, bool OwnsOutputStream = false); virtual ~LogDiagnosticPrinter(); diff --git a/clang/include/clang/Frontend/TextDiagnosticPrinter.h b/clang/include/clang/Frontend/TextDiagnosticPrinter.h index 79a9916cb43..2c632a0bee9 100644 --- a/clang/include/clang/Frontend/TextDiagnosticPrinter.h +++ b/clang/include/clang/Frontend/TextDiagnosticPrinter.h @@ -23,7 +23,7 @@ class DiagnosticOptions; class LangOptions; class TextDiagnosticPrinter : public DiagnosticClient { - llvm::raw_ostream &OS; + raw_ostream &OS; const LangOptions *LangOpts; const DiagnosticOptions *DiagOpts; @@ -36,7 +36,7 @@ class TextDiagnosticPrinter : public DiagnosticClient { std::string Prefix; public: - TextDiagnosticPrinter(llvm::raw_ostream &os, const DiagnosticOptions &diags, + TextDiagnosticPrinter(raw_ostream &os, const DiagnosticOptions &diags, bool OwnsOutputStream = false); virtual ~TextDiagnosticPrinter(); diff --git a/clang/include/clang/Frontend/Utils.h b/clang/include/clang/Frontend/Utils.h index 7cf705b2133..105e4eb0dec 100644 --- a/clang/include/clang/Frontend/Utils.h +++ b/clang/include/clang/Frontend/Utils.h @@ -69,7 +69,7 @@ void InitializePreprocessor(Preprocessor &PP, void ProcessWarningOptions(Diagnostic &Diags, const DiagnosticOptions &Opts); /// DoPrintPreprocessedInput - Implement -E mode. -void DoPrintPreprocessedInput(Preprocessor &PP, llvm::raw_ostream* OS, +void DoPrintPreprocessedInput(Preprocessor &PP, raw_ostream* OS, const PreprocessorOutputOptions &Opts); /// AttachDependencyFileGen - Create a dependency file generator, and attach diff --git a/clang/include/clang/Index/ASTLocation.h b/clang/include/clang/Index/ASTLocation.h index fc18dae1a20..d4babcc8fd9 100644 --- a/clang/include/clang/Index/ASTLocation.h +++ b/clang/include/clang/Index/ASTLocation.h @@ -150,7 +150,7 @@ public: SourceRange getSourceRange() const; - void print(llvm::raw_ostream &OS) const; + void print(raw_ostream &OS) const; }; /// \brief Like ASTLocation but also contains the TranslationUnit that the diff --git a/clang/include/clang/Index/CallGraph.h b/clang/include/clang/Index/CallGraph.h index 336bf47a2ef..38baf0f7537 100644 --- a/clang/include/clang/Index/CallGraph.h +++ b/clang/include/clang/Index/CallGraph.h @@ -94,7 +94,7 @@ public: Decl *getDecl(CallGraphNode *Node); - void print(llvm::raw_ostream &os); + void print(raw_ostream &os); void dump(); void ViewCallGraph() const; diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h index b85c993c528..5d9376c1f7e 100644 --- a/clang/include/clang/Parse/Parser.h +++ b/clang/include/clang/Parse/Parser.h @@ -42,7 +42,7 @@ class PrettyStackTraceParserEntry : public llvm::PrettyStackTraceEntry { const Parser &P; public: PrettyStackTraceParserEntry(const Parser &p) : P(p) {} - virtual void print(llvm::raw_ostream &OS) const; + virtual void print(raw_ostream &OS) const; }; /// PrecedenceLevels - These are precedences for the binary/ternary diff --git a/clang/include/clang/Rewrite/ASTConsumers.h b/clang/include/clang/Rewrite/ASTConsumers.h index b7f642764b2..da5153c61f5 100644 --- a/clang/include/clang/Rewrite/ASTConsumers.h +++ b/clang/include/clang/Rewrite/ASTConsumers.h @@ -14,11 +14,9 @@ #ifndef REWRITE_ASTCONSUMERS_H #define REWRITE_ASTCONSUMERS_H +#include "clang/Basic/LLVM.h" #include <string> -namespace llvm { - class raw_ostream; -} namespace clang { class ASTConsumer; @@ -29,14 +27,14 @@ class Preprocessor; // ObjC rewriter: attempts to rewrite ObjC constructs into pure C code. // This is considered experimental, and only works with Apple's ObjC runtime. ASTConsumer *CreateObjCRewriter(const std::string &InFile, - llvm::raw_ostream *OS, + raw_ostream *OS, Diagnostic &Diags, const LangOptions &LOpts, bool SilenceRewriteMacroWarning); /// CreateHTMLPrinter - Create an AST consumer which rewrites source code to /// HTML with syntax highlighting suitable for viewing in a web-browser. -ASTConsumer *CreateHTMLPrinter(llvm::raw_ostream *OS, Preprocessor &PP, +ASTConsumer *CreateHTMLPrinter(raw_ostream *OS, Preprocessor &PP, bool SyntaxHighlight = true, bool HighlightMacros = true); diff --git a/clang/include/clang/Rewrite/FixItRewriter.h b/clang/include/clang/Rewrite/FixItRewriter.h index bab99624ba4..f1028380c3d 100644 --- a/clang/include/clang/Rewrite/FixItRewriter.h +++ b/clang/include/clang/Rewrite/FixItRewriter.h @@ -79,7 +79,7 @@ public: /// \brief Write a single modified source file. /// /// \returns true if there was an error, false otherwise. - bool WriteFixedFile(FileID ID, llvm::raw_ostream &OS); + bool WriteFixedFile(FileID ID, raw_ostream &OS); /// \brief Write the modified source files. /// diff --git a/clang/include/clang/Rewrite/Rewriter.h b/clang/include/clang/Rewrite/Rewriter.h index 8da54bf60de..beddda88e02 100644 --- a/clang/include/clang/Rewrite/Rewriter.h +++ b/clang/include/clang/Rewrite/Rewriter.h @@ -54,7 +54,7 @@ public: iterator end() const { return Buffer.end(); } unsigned size() const { return Buffer.size(); } - llvm::raw_ostream &write(llvm::raw_ostream &) const; + raw_ostream &write(raw_ostream &) const; /// RemoveText - Remove the specified text. void RemoveText(unsigned OrigOffset, unsigned Size, diff --git a/clang/include/clang/Rewrite/Rewriters.h b/clang/include/clang/Rewrite/Rewriters.h index 669cf8c208e..203b9bc18b3 100644 --- a/clang/include/clang/Rewrite/Rewriters.h +++ b/clang/include/clang/Rewrite/Rewriters.h @@ -14,17 +14,16 @@ #ifndef LLVM_CLANG_REWRITE_REWRITERS_H #define LLVM_CLANG_REWRITE_REWRITERS_H -#include "llvm/ADT/StringRef.h" -#include "llvm/Support/raw_ostream.h" +#include "clang/Basic/LLVM.h" namespace clang { class Preprocessor; /// RewriteMacrosInInput - Implement -rewrite-macros mode. -void RewriteMacrosInInput(Preprocessor &PP, llvm::raw_ostream* OS); +void RewriteMacrosInInput(Preprocessor &PP, raw_ostream *OS); /// DoRewriteTest - A simple test for the TokenRewriter class. -void DoRewriteTest(Preprocessor &PP, llvm::raw_ostream* OS); +void DoRewriteTest(Preprocessor &PP, raw_ostream *OS); } // end namespace clang diff --git a/clang/include/clang/Sema/CodeCompleteConsumer.h b/clang/include/clang/Sema/CodeCompleteConsumer.h index caf8131c2bf..93722b933a6 100644 --- a/clang/include/clang/Sema/CodeCompleteConsumer.h +++ b/clang/include/clang/Sema/CodeCompleteConsumer.h @@ -466,7 +466,7 @@ public: const char *CopyString(StringRef String); /// \brief Copy the given string into this allocator. - const char *CopyString(llvm::Twine String); + const char *CopyString(Twine String); // \brief Copy the given string into this allocator. const char *CopyString(const char *String) { @@ -709,7 +709,7 @@ inline bool operator>=(const CodeCompletionResult &X, } -llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, +raw_ostream &operator<<(raw_ostream &OS, const CodeCompletionString &CCS); /// \brief Abstract interface for a consumer of code-completion @@ -850,7 +850,7 @@ public: /// receives in a simple format. class PrintingCodeCompleteConsumer : public CodeCompleteConsumer { /// \brief The raw output stream. - llvm::raw_ostream &OS; + raw_ostream &OS; CodeCompletionAllocator Allocator; @@ -859,7 +859,7 @@ public: /// results to the given raw output stream. PrintingCodeCompleteConsumer(bool IncludeMacros, bool IncludeCodePatterns, bool IncludeGlobals, - llvm::raw_ostream &OS) + raw_ostream &OS) : CodeCompleteConsumer(IncludeMacros, IncludeCodePatterns, IncludeGlobals, false), OS(OS) {} diff --git a/clang/include/clang/Sema/Initialization.h b/clang/include/clang/Sema/Initialization.h index eacb3fe421f..880ed2f9d2f 100644 --- a/clang/include/clang/Sema/Initialization.h +++ b/clang/include/clang/Sema/Initialization.h @@ -857,7 +857,7 @@ public: /// \brief Dump a representation of this initialization sequence to /// the given stream, for debugging purposes. - void dump(llvm::raw_ostream &OS) const; + void dump(raw_ostream &OS) const; /// \brief Dump a representation of this initialization sequence to /// standard error, for debugging purposes. diff --git a/clang/include/clang/Sema/Lookup.h b/clang/include/clang/Sema/Lookup.h index dceed4efc97..1a11dfaad82 100644 --- a/clang/include/clang/Sema/Lookup.h +++ b/clang/include/clang/Sema/Lookup.h @@ -468,7 +468,7 @@ public: configure(); } - void print(llvm::raw_ostream &); + void print(raw_ostream &); /// Suppress the diagnostics that would normally fire because of this /// lookup. This happens during (e.g.) redeclaration lookups. diff --git a/clang/include/clang/Sema/PrettyDeclStackTrace.h b/clang/include/clang/Sema/PrettyDeclStackTrace.h index b78a1c01e5e..a31312cdc6d 100644 --- a/clang/include/clang/Sema/PrettyDeclStackTrace.h +++ b/clang/include/clang/Sema/PrettyDeclStackTrace.h @@ -38,7 +38,7 @@ public: PrettyDeclStackTraceEntry(Sema &S, Decl *D, SourceLocation Loc, const char *Msg) : S(S), TheDecl(D), Loc(Loc), Message(Msg) {} - virtual void print(llvm::raw_ostream &OS) const; + virtual void print(raw_ostream &OS) const; }; } diff --git a/clang/include/clang/Serialization/ASTWriter.h b/clang/include/clang/Serialization/ASTWriter.h index 94d254eadfc..4e2583db1e8 100644 --- a/clang/include/clang/Serialization/ASTWriter.h +++ b/clang/include/clang/Serialization/ASTWriter.h @@ -617,7 +617,7 @@ class PCHGenerator : public SemaConsumer { const Preprocessor &PP; std::string OutputFile; const char *isysroot; - llvm::raw_ostream *Out; + raw_ostream *Out; Sema *SemaPtr; MemorizeStatCalls *StatCalls; // owned by the FileManager std::vector<unsigned char> Buffer; @@ -631,7 +631,7 @@ protected: public: PCHGenerator(const Preprocessor &PP, const std::string &OutputFile, bool Chaining, - const char *isysroot, llvm::raw_ostream *Out); + const char *isysroot, raw_ostream *Out); virtual void InitializeSema(Sema &S) { SemaPtr = &S; } virtual void HandleTranslationUnit(ASTContext &Ctx); virtual ASTMutationListener *GetASTMutationListener(); diff --git a/clang/include/clang/StaticAnalyzer/Core/CheckerProvider.h b/clang/include/clang/StaticAnalyzer/Core/CheckerProvider.h index b8aaaa1a04c..905d4c959f9 100644 --- a/clang/include/clang/StaticAnalyzer/Core/CheckerProvider.h +++ b/clang/include/clang/StaticAnalyzer/Core/CheckerProvider.h @@ -48,7 +48,7 @@ public: virtual ~CheckerProvider(); virtual void registerCheckers(CheckerManager &checkerMgr, CheckerOptInfo *checkOpts, unsigned numCheckOpts) = 0; - virtual void printHelp(llvm::raw_ostream &OS) = 0; + virtual void printHelp(raw_ostream &OS) = 0; }; } // end ento namespace diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h index 199b41afefa..8757b791392 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h @@ -51,7 +51,7 @@ public: virtual const GRState *removeDeadBindings(const GRState *state, SymbolReaper& SymReaper) = 0; - virtual void print(const GRState *state, llvm::raw_ostream& Out, + virtual void print(const GRState *state, raw_ostream& Out, const char* nl, const char *sep) = 0; virtual void EndPath(const GRState *state) {} diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h index 0d61d0e620e..2f610c9c40b 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h @@ -347,17 +347,17 @@ public: class Printer { public: virtual ~Printer() {} - virtual void Print(llvm::raw_ostream& Out, const GRState* state, + virtual void Print(raw_ostream& Out, const GRState* state, const char* nl, const char* sep) = 0; }; // Pretty-printing. - void print(llvm::raw_ostream& Out, CFG &C, const char *nl = "\n", + void print(raw_ostream& Out, CFG &C, const char *nl = "\n", const char *sep = "") const; void printStdErr(CFG &C) const; - void printDOT(llvm::raw_ostream& Out, CFG &C) const; + void printDOT(raw_ostream& Out, CFG &C) const; private: /// Increments the number of times this state is referenced by ExplodeNodes. diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h index db7a930b556..05173aa0360 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h @@ -136,7 +136,7 @@ public: /// Compute the offset within the top level memory object. RegionOffset getAsOffset() const; - virtual void dumpToStream(llvm::raw_ostream& os) const; + virtual void dumpToStream(raw_ostream& os) const; void dump() const; @@ -197,7 +197,7 @@ class StaticGlobalSpaceRegion : public GlobalsSpaceRegion { public: void Profile(llvm::FoldingSetNodeID &ID) const; - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; const CodeTextRegion *getCodeRegion() const { return CR; } @@ -214,7 +214,7 @@ class NonStaticGlobalSpaceRegion : public GlobalsSpaceRegion { public: - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion *R) { return R->getKind() == NonStaticGlobalSpaceRegionKind; @@ -341,7 +341,7 @@ public: static void ProfileRegion(llvm::FoldingSetNodeID& ID, const Expr* Ex, unsigned Cnt, const MemRegion *superRegion); - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion* R) { return R->getKind() == AllocaRegionKind; @@ -415,7 +415,7 @@ public: return FD; } - virtual void dumpToStream(llvm::raw_ostream& os) const; + virtual void dumpToStream(raw_ostream& os) const; void Profile(llvm::FoldingSetNodeID& ID) const; @@ -456,7 +456,7 @@ public: AnalysisContext *getAnalysisContext() const { return AC; } - virtual void dumpToStream(llvm::raw_ostream& os) const; + virtual void dumpToStream(raw_ostream& os) const; void Profile(llvm::FoldingSetNodeID& ID) const; @@ -518,7 +518,7 @@ public: referenced_vars_iterator referenced_vars_begin() const; referenced_vars_iterator referenced_vars_end() const; - virtual void dumpToStream(llvm::raw_ostream& os) const; + virtual void dumpToStream(raw_ostream& os) const; void Profile(llvm::FoldingSetNodeID& ID) const; @@ -559,7 +559,7 @@ public: SymbolRef sym, const MemRegion* superRegion); - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion* R) { return R->getKind() == SymbolicRegionKind; @@ -595,7 +595,7 @@ public: ProfileRegion(ID, Str, superRegion); } - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion* R) { return R->getKind() == StringRegionKind; @@ -625,7 +625,7 @@ public: void Profile(llvm::FoldingSetNodeID& ID) const; - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; const CompoundLiteralExpr* getLiteralExpr() const { return CL; } @@ -680,7 +680,7 @@ public: return getDecl()->getType(); } - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion* R) { return R->getKind() == VarRegionKind; @@ -707,7 +707,7 @@ public: return QualType(ThisPointerTy, 0); } - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion* R) { return R->getKind() == CXXThisRegionKind; @@ -725,7 +725,7 @@ class FieldRegion : public DeclRegion { public: - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; const FieldDecl* getDecl() const { return cast<FieldDecl>(D); } @@ -762,7 +762,7 @@ public: const ObjCIvarDecl* getDecl() const { return cast<ObjCIvarDecl>(D); } QualType getValueType() const { return getDecl()->getType(); } - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; static bool classof(const MemRegion* R) { return R->getKind() == ObjCIvarRegionKind; @@ -789,7 +789,7 @@ public: CharUnits getOffset() const { return Offset; } const MemRegion *getRegion() const { return Region; } - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; void dump() const; }; @@ -824,7 +824,7 @@ public: /// Compute the offset within the array. The array might also be a subobject. RegionRawOffset getAsArrayOffset() const; - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; void Profile(llvm::FoldingSetNodeID& ID) const; @@ -850,7 +850,7 @@ public: return Ex->getType(); } - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; void Profile(llvm::FoldingSetNodeID &ID) const; @@ -877,7 +877,7 @@ public: QualType getValueType() const; - void dumpToStream(llvm::raw_ostream& os) const; + void dumpToStream(raw_ostream& os) const; void Profile(llvm::FoldingSetNodeID &ID) const; diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h index 5206ad97b8f..6761df4b37a 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h @@ -142,7 +142,7 @@ public: const MemRegion *getAsRegion() const; - void dumpToStream(llvm::raw_ostream& OS) const; + void dumpToStream(raw_ostream& OS) const; void dump() const; // Iterators. @@ -240,7 +240,7 @@ protected: : DefinedSVal(d, false, SubKind) {} public: - void dumpToStream(llvm::raw_ostream& Out) const; + void dumpToStream(raw_ostream& Out) const; // Implement isa<T> support. static inline bool classof(const SVal* V) { @@ -254,7 +254,7 @@ protected: : DefinedSVal(const_cast<void*>(D), true, SubKind) {} public: - void dumpToStream(llvm::raw_ostream& Out) const; + void dumpToStream(raw_ostream& Out) const; Loc(const Loc& X) : DefinedSVal(X.Data, true, X.getSubKind()) {} @@ -533,7 +533,7 @@ public: } // end clang namespace namespace llvm { -static inline llvm::raw_ostream& operator<<(llvm::raw_ostream& os, +static inline raw_ostream& operator<<(raw_ostream& os, clang::ento::SVal V) { V.dumpToStream(os); return os; diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h index 3c8b16945eb..4d50815c617 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h @@ -197,7 +197,7 @@ public: virtual StoreRef enterStackFrame(const GRState *state, const StackFrameContext *frame); - virtual void print(Store store, llvm::raw_ostream& Out, + virtual void print(Store store, raw_ostream& Out, const char* nl, const char *sep) = 0; class BindingsHandler { diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h index ad173bb4353..521eb55b875 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h @@ -58,7 +58,7 @@ public: void dump() const; - virtual void dumpToStream(llvm::raw_ostream &os) const = 0; + virtual void dumpToStream(raw_ostream &os) const = 0; virtual QualType getType(ASTContext&) const = 0; virtual void Profile(llvm::FoldingSetNodeID& profile) = 0; @@ -109,7 +109,7 @@ public: Profile(profile, R); } - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; QualType getType(ASTContext&) const; @@ -138,7 +138,7 @@ public: QualType getType(ASTContext&) const; - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; static void Profile(llvm::FoldingSetNodeID& profile, const Stmt* S, QualType T, unsigned Count, const void* SymbolTag) { @@ -174,7 +174,7 @@ public: QualType getType(ASTContext&) const; - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; static void Profile(llvm::FoldingSetNodeID& profile, SymbolRef parent, const TypedRegion *r) { @@ -207,7 +207,7 @@ public: QualType getType(ASTContext&) const; - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; static void Profile(llvm::FoldingSetNodeID& profile, const SubRegion *R) { profile.AddInteger((unsigned) ExtentKind); @@ -246,7 +246,7 @@ public: QualType getType(ASTContext&) const; - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; static void Profile(llvm::FoldingSetNodeID& profile, const MemRegion *R, const Stmt *S, QualType T, unsigned Count, @@ -287,7 +287,7 @@ public: BinaryOperator::Opcode getOpcode() const { return Op; } - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; const SymExpr *getLHS() const { return LHS; } const llvm::APSInt &getRHS() const { return RHS; } @@ -332,7 +332,7 @@ public: // generation of virtual functions. QualType getType(ASTContext& C) const { return T; } - void dumpToStream(llvm::raw_ostream &os) const; + void dumpToStream(raw_ostream &os) const; static void Profile(llvm::FoldingSetNodeID& ID, const SymExpr *lhs, BinaryOperator::Opcode op, const SymExpr *rhs, QualType t) { @@ -480,7 +480,7 @@ public: } // end clang namespace namespace llvm { -static inline llvm::raw_ostream& operator<<(llvm::raw_ostream& os, +static inline raw_ostream& operator<<(raw_ostream& os, const clang::ento::SymExpr *SE) { SE->dumpToStream(os); return os; diff --git a/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h b/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h index 9c79909bd53..f9cd0f19776 100644 --- a/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h +++ b/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h @@ -26,7 +26,7 @@ protected: StringRef InFile); }; -void printCheckerHelp(llvm::raw_ostream &OS); +void printCheckerHelp(raw_ostream &OS); } // end GR namespace diff --git a/clang/lib/CodeGen/CGRecordLayout.h b/clang/lib/CodeGen/CGRecordLayout.h index 8a450298f70..e2fd45dc86b 100644 --- a/clang/lib/CodeGen/CGRecordLayout.h +++ b/clang/lib/CodeGen/CGRecordLayout.h @@ -144,7 +144,7 @@ public: /// @} - void print(llvm::raw_ostream &OS) const; + void print(raw_ostream &OS) const; void dump() const; /// \brief Given a bit-field decl, build an appropriate helper object for @@ -270,7 +270,7 @@ public: return it->second; } - void print(llvm::raw_ostream &OS) const; + void print(raw_ostream &OS) const; void dump() const; }; diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 656158d77fb..0a76e460776 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -1487,7 +1487,7 @@ public: /// block. The caller is responsible for setting an appropriate alignment on /// the alloca. llvm::AllocaInst *CreateTempAlloca(llvm::Type *Ty, - const llvm::Twine &Name = "tmp"); + const Twine &Name = "tmp"); /// InitTempAlloca - Provide an initial value for the given alloca. void InitTempAlloca(llvm::AllocaInst *Alloca, llvm::Value *Value); @@ -1497,15 +1497,15 @@ public: /// value needs to be stored into an alloca (for example, to avoid explicit /// PHI construction), but the type is the IR type, not the type appropriate /// for storing in memory. - llvm::AllocaInst *CreateIRTemp(QualType T, const llvm::Twine &Name = "tmp"); + llvm::AllocaInst *CreateIRTemp(QualType T, const Twine &Name = "tmp"); /// CreateMemTemp - Create a temporary memory object of the given type, with /// appropriate alignment. - llvm::AllocaInst *CreateMemTemp(QualType T, const llvm::Twine &Name = "tmp"); + llvm::AllocaInst *CreateMemTemp(QualType T, const Twine &Name = "tmp"); /// CreateAggTemp - Create a temporary memory object for the given /// aggregate type. - AggValueSlot CreateAggTemp(QualType T, const llvm::Twine &Name = "tmp") { + AggValueSlot CreateAggTemp(QualType T, const Twine &Name = "tmp") { return AggValueSlot::forAddr(CreateMemTemp(T, Name), T.getQualifiers(), false); } @@ -2075,9 +2075,9 @@ public: llvm::CallSite EmitCallOrInvoke(llvm::Value *Callee, llvm::ArrayRef<llvm::Value *> Args, - const llvm::Twine &Name = ""); + const Twine &Name = ""); llvm::CallSite EmitCallOrInvoke(llvm::Value *Callee, - const llvm::Twine &Name = ""); + const Twine &Name = ""); llvm::Value *BuildVirtualCall(const CXXMethodDecl *MD, llvm::Value *This, llvm::Type *Ty); |
