summaryrefslogtreecommitdiffstats
path: root/clang/tools/clang-cc
diff options
context:
space:
mode:
Diffstat (limited to 'clang/tools/clang-cc')
-rw-r--r--clang/tools/clang-cc/Options.cpp16
-rw-r--r--clang/tools/clang-cc/Options.h6
-rw-r--r--clang/tools/clang-cc/clang-cc.cpp10
3 files changed, 16 insertions, 16 deletions
diff --git a/clang/tools/clang-cc/Options.cpp b/clang/tools/clang-cc/Options.cpp
index de2122a892a..f6d7aa7857d 100644
--- a/clang/tools/clang-cc/Options.cpp
+++ b/clang/tools/clang-cc/Options.cpp
@@ -15,7 +15,7 @@
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/Frontend/AnalysisConsumer.h"
-#include "clang/Frontend/CompileOptions.h"
+#include "clang/CodeGen/CodeGenOptions.h"
#include "clang/Frontend/DependencyOutputOptions.h"
#include "clang/Frontend/DiagnosticOptions.h"
#include "clang/Frontend/HeaderSearchOptions.h"
@@ -607,7 +607,7 @@ DumpDefines("dD", llvm::cl::desc("Print macro definitions in -E mode in "
// Option Object Construction
//===----------------------------------------------------------------------===//
-void clang::InitializeCompileOptions(CompileOptions &Opts,
+void clang::InitializeCodeGenOptions(CodeGenOptions &Opts,
const TargetInfo &Target) {
using namespace codegenoptions;
@@ -648,8 +648,8 @@ void clang::InitializeCompileOptions(CompileOptions &Opts,
Opts.OptimizationLevel = OptSize ? 2 : OptLevel;
// We must always run at least the always inlining pass.
- Opts.Inlining = (Opts.OptimizationLevel > 1) ? CompileOptions::NormalInlining
- : CompileOptions::OnlyAlwaysInlining;
+ Opts.Inlining = (Opts.OptimizationLevel > 1) ? CodeGenOptions::NormalInlining
+ : CodeGenOptions::OnlyAlwaysInlining;
Opts.CPU = TargetCPU;
Opts.DebugInfo = GenerateDebugInfo;
@@ -866,7 +866,7 @@ void clang::InitializePreprocessorOptions(PreprocessorOptions &Opts) {
void clang::InitializeLangOptions(LangOptions &Options, LangKind LK,
TargetInfo &Target,
- const CompileOptions &CompileOpts) {
+ const CodeGenOptions &CodeGenOpts) {
using namespace langoptions;
bool NoPreprocess = false;
@@ -932,7 +932,7 @@ void clang::InitializeLangOptions(LangOptions &Options, LangKind LK,
// Pass the map of target features to the target for validation and
// processing.
- Target.HandleTargetFeatures(CompileOpts.Features);
+ Target.HandleTargetFeatures(CodeGenOpts.Features);
if (LangStd == lang_unspecified) {
// Based on the base language, pick one.
@@ -1088,7 +1088,7 @@ void clang::InitializeLangOptions(LangOptions &Options, LangKind LK,
// The __OPTIMIZE_SIZE__ define is tied to -Oz, which we don't support.
Options.OptimizeSize = 0;
- Options.Optimize = !!CompileOpts.OptimizationLevel;
+ Options.Optimize = !!CodeGenOpts.OptimizationLevel;
assert(PICLevel <= 2 && "Invalid value for -pic-level");
Options.PICLevel = PICLevel;
@@ -1099,7 +1099,7 @@ void clang::InitializeLangOptions(LangOptions &Options, LangKind LK,
// This is the __NO_INLINE__ define, which just depends on things like the
// optimization level and -fno-inline, not actually whether the backend has
// inlining enabled.
- Options.NoInline = !CompileOpts.OptimizationLevel;
+ Options.NoInline = !CodeGenOpts.OptimizationLevel;
Options.Static = StaticDefine;
diff --git a/clang/tools/clang-cc/Options.h b/clang/tools/clang-cc/Options.h
index 6275e77e975..ae446a7b634 100644
--- a/clang/tools/clang-cc/Options.h
+++ b/clang/tools/clang-cc/Options.h
@@ -15,7 +15,7 @@
namespace clang {
class AnalyzerOptions;
-class CompileOptions;
+class CodeGenOptions;
class DependencyOutputOptions;
class DiagnosticOptions;
class HeaderSearchOptions;
@@ -45,7 +45,7 @@ void InitializeDependencyOutputOptions(DependencyOutputOptions &Opts);
void InitializeDiagnosticOptions(DiagnosticOptions &Opts);
-void InitializeCompileOptions(CompileOptions &Opts,
+void InitializeCodeGenOptions(CodeGenOptions &Opts,
const TargetInfo &Target);
void InitializeHeaderSearchOptions(HeaderSearchOptions &Opts,
@@ -55,7 +55,7 @@ void InitializeHeaderSearchOptions(HeaderSearchOptions &Opts,
void InitializeLangOptions(LangOptions &Options, LangKind LK,
TargetInfo &Target,
- const CompileOptions &CompileOpts);
+ const CodeGenOptions &CodeGenOpts);
void InitializePreprocessorOptions(PreprocessorOptions &Opts);
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index e78cc9387a3..c7ead4d3fb0 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -565,7 +565,7 @@ static ASTConsumer *CreateConsumerAction(const CompilerInvocation &CompOpts,
}
return CreateBackendConsumer(Act, PP.getDiagnostics(), PP.getLangOptions(),
- CompOpts.getCompileOpts(), InFile, OS.get(),
+ CompOpts.getCodeGenOpts(), InFile, OS.get(),
Context);
}
@@ -985,7 +985,7 @@ static LangKind GetLanguage() {
return LK;
}
-static void FinalizeCompileOptions(CompileOptions &Opts,
+static void FinalizeCodeGenOptions(CodeGenOptions &Opts,
const LangOptions &Lang) {
if (Lang.NoBuiltin)
Opts.SimplifyLibCalls = 0;
@@ -1007,7 +1007,7 @@ static void ConstructCompilerInvocation(CompilerInvocation &Opts,
// Initialize backend options, which may also be used to key some language
// options.
- InitializeCompileOptions(Opts.getCompileOpts(), Target);
+ InitializeCodeGenOptions(Opts.getCodeGenOpts(), Target);
// Initialize language options.
//
@@ -1015,7 +1015,7 @@ static void ConstructCompilerInvocation(CompilerInvocation &Opts,
// code path to make this obvious.
if (LK != langkind_ast)
InitializeLangOptions(Opts.getLangOpts(), LK, Target,
- Opts.getCompileOpts());
+ Opts.getCodeGenOpts());
// Initialize the static analyzer options.
InitializeAnalyzerOptions(Opts.getAnalyzerOpts());
@@ -1036,7 +1036,7 @@ static void ConstructCompilerInvocation(CompilerInvocation &Opts,
InitializePreprocessorOutputOptions(Opts.getPreprocessorOutputOpts());
// Finalize some code generation options.
- FinalizeCompileOptions(Opts.getCompileOpts(), Opts.getLangOpts());
+ FinalizeCodeGenOptions(Opts.getCodeGenOpts(), Opts.getLangOpts());
}
static Diagnostic *CreateDiagnosticEngine(const DiagnosticOptions &Opts,
OpenPOWER on IntegriCloud