diff options
| -rw-r--r-- | clang/include/clang/Basic/TargetInfo.h | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/TargetInfo.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Frontend/ASTUnit.cpp | 10 | ||||
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index e1d01168b94..49fa78a1d59 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -630,7 +630,7 @@ public: /// /// Apply changes to the target information with respect to certain /// language options which change the target configuration. - virtual void setForcedLangOptions(LangOptions &Opts); + virtual void adjust(const LangOptions &Opts); /// \brief Get the default set of target features for the CPU; /// this should include all legal feature strings on the target. diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp index 71e39dd7d8c..adaa2e82f3f 100644 --- a/clang/lib/Basic/TargetInfo.cpp +++ b/clang/lib/Basic/TargetInfo.cpp @@ -242,10 +242,10 @@ bool TargetInfo::isTypeSigned(IntType T) { }; } -/// setForcedLangOptions - Set forced language options. +/// adjust - Set forced language options. /// Apply changes to the target information with respect to certain /// language options which change the target configuration. -void TargetInfo::setForcedLangOptions(LangOptions &Opts) { +void TargetInfo::adjust(const LangOptions &Opts) { if (Opts.NoBitFieldTypeAlign) UseBitFieldTypeAlignment = false; if (Opts.ShortWChar) diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp index 055537b46fd..be35e31a0b6 100644 --- a/clang/lib/Frontend/ASTUnit.cpp +++ b/clang/lib/Frontend/ASTUnit.cpp @@ -559,7 +559,7 @@ private: // // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. - Target->setForcedLangOptions(LangOpt); + Target->adjust(LangOpt); // Initialize the preprocessor. PP.Initialize(*Target); @@ -1077,7 +1077,7 @@ bool ASTUnit::Parse(llvm::MemoryBuffer *OverrideMainBuffer) { // // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. - Clang->getTarget().setForcedLangOptions(Clang->getLangOpts()); + Clang->getTarget().adjust(Clang->getLangOpts()); assert(Clang->getFrontendOpts().Inputs.size() == 1 && "Invocation must have exactly one source file!"); @@ -1580,7 +1580,7 @@ llvm::MemoryBuffer *ASTUnit::getMainBufferWithPrecompiledPreamble( // // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. - Clang->getTarget().setForcedLangOptions(Clang->getLangOpts()); + Clang->getTarget().adjust(Clang->getLangOpts()); assert(Clang->getFrontendOpts().Inputs.size() == 1 && "Invocation must have exactly one source file!"); @@ -1841,7 +1841,7 @@ ASTUnit *ASTUnit::LoadFromCompilerInvocationAction( // // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. - Clang->getTarget().setForcedLangOptions(Clang->getLangOpts()); + Clang->getTarget().adjust(Clang->getLangOpts()); assert(Clang->getFrontendOpts().Inputs.size() == 1 && "Invocation must have exactly one source file!"); @@ -2420,7 +2420,7 @@ void ASTUnit::CodeComplete(StringRef File, unsigned Line, unsigned Column, // // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. - Clang->getTarget().setForcedLangOptions(Clang->getLangOpts()); + Clang->getTarget().adjust(Clang->getLangOpts()); assert(Clang->getFrontendOpts().Inputs.size() == 1 && "Invocation must have exactly one source file!"); diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 3b69fa27912..da663fe9be2 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -720,7 +720,7 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) { // // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. - getTarget().setForcedLangOptions(getLangOpts()); + getTarget().adjust(getLangOpts()); // rewriter project will change target built-in bool type from its default. if (getFrontendOpts().ProgramAction == frontend::RewriteObjC) |
