diff options
Diffstat (limited to 'lib/Driver')
-rw-r--r-- | lib/Driver/Arg.cpp | 4 | ||||
-rw-r--r-- | lib/Driver/ArgList.cpp | 2 | ||||
-rw-r--r-- | lib/Driver/Driver.cpp | 6 | ||||
-rw-r--r-- | lib/Driver/ToolChains.cpp | 4 | ||||
-rw-r--r-- | lib/Driver/Tools.cpp | 14 |
5 files changed, 15 insertions, 15 deletions
diff --git a/lib/Driver/Arg.cpp b/lib/Driver/Arg.cpp index 39b7e55564..c0a2a506a6 100644 --- a/lib/Driver/Arg.cpp +++ b/lib/Driver/Arg.cpp @@ -61,7 +61,7 @@ void Arg::dump() const { } std::string Arg::getAsString(const ArgList &Args) const { - llvm::SmallString<256> Res; + SmallString<256> Res; llvm::raw_svector_ostream OS(Res); ArgStringList ASL; @@ -94,7 +94,7 @@ void Arg::render(const ArgList &Args, ArgStringList &Output) const { break; case Option::RenderCommaJoinedStyle: { - llvm::SmallString<256> Res; + SmallString<256> Res; llvm::raw_svector_ostream OS(Res); OS << getOption().getName(); for (unsigned i = 0, e = getNumValues(); i != e; ++i) { diff --git a/lib/Driver/ArgList.cpp b/lib/Driver/ArgList.cpp index 3c9e71d6f8..d26da25b3e 100644 --- a/lib/Driver/ArgList.cpp +++ b/lib/Driver/ArgList.cpp @@ -228,7 +228,7 @@ void ArgList::ClaimAllArgs() const { } const char *ArgList::MakeArgString(const Twine &T) const { - llvm::SmallString<256> Str; + SmallString<256> Str; T.toVector(Str); return MakeArgString(Str.str()); } diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 6f93d0be25..bab7568736 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -80,7 +80,7 @@ Driver::Driver(StringRef ClangExecutable, // Compute the path to the resource directory. StringRef ClangResourceDir(CLANG_RESOURCE_DIR); - llvm::SmallString<128> P(Dir); + SmallString<128> P(Dir); if (ClangResourceDir != "") llvm::sys::path::append(P, ClangResourceDir); else @@ -964,7 +964,7 @@ void Driver::BuildInputs(const ToolChain &TC, const DerivedArgList &Args, // Check that the file exists, if enabled. if (CheckInputsExist && memcmp(Value, "-", 2) != 0) { - llvm::SmallString<64> Path(Value); + SmallString<64> Path(Value); if (Arg *WorkDir = Args.getLastArg(options::OPT_working_directory)) if (llvm::sys::path::is_absolute(Path.str())) { Path = WorkDir->getValue(Args); @@ -1408,7 +1408,7 @@ const char *Driver::GetNamedOutputPath(Compilation &C, return C.addTempFile(C.getArgs().MakeArgString(TmpName.c_str())); } - llvm::SmallString<128> BasePath(BaseInput); + SmallString<128> BasePath(BaseInput); StringRef BaseName; // Dsymutil actions should use the full path. diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 79d84544a8..48d798b990 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -184,7 +184,7 @@ std::string Darwin::ComputeEffectiveClangTriple(const ArgList &Args, unsigned Version[3]; getTargetVersion(Version); - llvm::SmallString<16> Str; + SmallString<16> Str; llvm::raw_svector_ostream(Str) << (isTargetIPhoneOS() ? "ios" : "macosx") << Version[0] << "." << Version[1] << "." << Version[2]; @@ -1132,7 +1132,7 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector( SmallVector<std::string, 8> Prefixes(D.PrefixDirs.begin(), D.PrefixDirs.end()); - llvm::SmallString<128> CxxInstallRoot(GCC_INSTALL_PREFIX); + SmallString<128> CxxInstallRoot(GCC_INSTALL_PREFIX); if (CxxInstallRoot != "") { if (CxxInstallRoot.back() == '/') llvm::sys::path::remove_filename(CxxInstallRoot); // remove the / diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 93dcd0d461..5c88468b29 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -234,13 +234,13 @@ void Clang::AddPreprocessingOptions(Compilation &C, // Otherwise derive from the base input. // // FIXME: This should use the computed output file location. - llvm::SmallString<128> P(Inputs[0].getBaseInput()); + SmallString<128> P(Inputs[0].getBaseInput()); llvm::sys::path::replace_extension(P, "o"); DepTarget = Args.MakeArgString(llvm::sys::path::filename(P)); } CmdArgs.push_back("-MT"); - llvm::SmallString<128> Quoted; + SmallString<128> Quoted; QuoteTarget(DepTarget, Quoted); CmdArgs.push_back(Args.MakeArgString(Quoted)); } @@ -268,7 +268,7 @@ void Clang::AddPreprocessingOptions(Compilation &C, if (A->getOption().matches(options::OPT_MQ)) { CmdArgs.push_back("-MT"); - llvm::SmallString<128> Quoted; + SmallString<128> Quoted; QuoteTarget(A->getValue(Args), Quoted); CmdArgs.push_back(Args.MakeArgString(Quoted)); @@ -379,7 +379,7 @@ void Clang::AddPreprocessingOptions(Compilation &C, A->claim(); A->render(Args, CmdArgs); } else { - llvm::SmallString<128> DefaultModuleCache; + SmallString<128> DefaultModuleCache; llvm::sys::path::system_temp_directory(/*erasedOnReboot=*/false, DefaultModuleCache); llvm::sys::path::append(DefaultModuleCache, "clang-module-cache"); @@ -1185,7 +1185,7 @@ static void addAsanRTLinux(const ToolChain &TC, const ArgList &Args, // LibAsan is "libclang_rt.asan-<ArchName>.a" in the Linux library resource // directory. - llvm::SmallString<128> LibAsan(TC.getDriver().ResourceDir); + SmallString<128> LibAsan(TC.getDriver().ResourceDir); llvm::sys::path::append(LibAsan, "lib", "linux", (Twine("libclang_rt.asan-") + TC.getArchName() + ".a")); @@ -2511,7 +2511,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, ie = Args.end(); it != ie; ++it) (*it)->render(Args, OriginalArgs); - llvm::SmallString<256> Flags; + SmallString<256> Flags; Flags += Exec; for (unsigned i = 0, e = OriginalArgs.size(); i != e; ++i) { Flags += " "; @@ -2608,7 +2608,7 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA, ie = Args.end(); it != ie; ++it) (*it)->render(Args, OriginalArgs); - llvm::SmallString<256> Flags; + SmallString<256> Flags; const char *Exec = getToolChain().getDriver().getClangProgramPath(); Flags += Exec; for (unsigned i = 0, e = OriginalArgs.size(); i != e; ++i) { |