diff options
| -rw-r--r-- | include/clang/CodeGen/BackendUtil.h | 1 | ||||
| -rw-r--r-- | include/clang/CodeGen/CodeGenAction.h | 5 | ||||
| -rw-r--r-- | include/clang/Driver/CC1Options.td | 3 | ||||
| -rw-r--r-- | include/clang/Frontend/FrontendOptions.h | 1 | ||||
| -rw-r--r-- | lib/CodeGen/BackendUtil.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenAction.cpp | 4 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 3 | ||||
| -rw-r--r-- | lib/FrontendTool/ExecuteCompilerInvocation.cpp | 1 |
8 files changed, 0 insertions, 21 deletions
diff --git a/include/clang/CodeGen/BackendUtil.h b/include/clang/CodeGen/BackendUtil.h index 85f8aa0803..135b6a927f 100644 --- a/include/clang/CodeGen/BackendUtil.h +++ b/include/clang/CodeGen/BackendUtil.h @@ -25,7 +25,6 @@ namespace clang { enum BackendAction { Backend_EmitAssembly, ///< Emit native assembly files Backend_EmitBC, ///< Emit LLVM bitcode files - Backend_EmitBCVerify, ///< Emit LLVM bitcode files and verify Backend_EmitLL, ///< Emit human-readable LLVM assembly Backend_EmitNothing, ///< Don't emit anything (benchmarking mode) Backend_EmitMCNull, ///< Run CodeGen, but don't emit anything diff --git a/include/clang/CodeGen/CodeGenAction.h b/include/clang/CodeGen/CodeGenAction.h index 6545a470f5..9697bc62af 100644 --- a/include/clang/CodeGen/CodeGenAction.h +++ b/include/clang/CodeGen/CodeGenAction.h @@ -72,11 +72,6 @@ public: EmitBCAction(llvm::LLVMContext *_VMContext = 0); }; -class EmitBCVerifyAction : public CodeGenAction { -public: - EmitBCVerifyAction(llvm::LLVMContext *_VMContext = 0); -}; - class EmitLLVMAction : public CodeGenAction { public: EmitLLVMAction(llvm::LLVMContext *_VMContext = 0); diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index ad891272b1..e8c5398dec 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -395,9 +395,6 @@ def emit_llvm : Flag<"-emit-llvm">, HelpText<"Build ASTs then convert to LLVM, emit .ll file">; def emit_llvm_bc : Flag<"-emit-llvm-bc">, HelpText<"Build ASTs then convert to LLVM, emit .bc file">; -def emit_llvm_bc_verify : Flag<"-emit-llvm-bc-verify">, - HelpText<"Build ASTs then convert to LLVM, emit .bc file" - " and finally verify bitcode serialization/deserialization">; def emit_llvm_only : Flag<"-emit-llvm-only">, HelpText<"Build ASTs and convert to LLVM, discarding output">; def emit_codegen_only : Flag<"-emit-codegen-only">, diff --git a/include/clang/Frontend/FrontendOptions.h b/include/clang/Frontend/FrontendOptions.h index 0af5b4574c..fa6d044ce0 100644 --- a/include/clang/Frontend/FrontendOptions.h +++ b/include/clang/Frontend/FrontendOptions.h @@ -28,7 +28,6 @@ namespace frontend { DumpTokens, ///< Dump out preprocessed tokens. EmitAssembly, ///< Emit a .s file. EmitBC, ///< Emit a .bc file. - EmitBCVerify, ///< Emit and verify .bc file. EmitHTML, ///< Translate input source into HTML. EmitLLVM, ///< Emit a .ll file. EmitLLVMOnly, ///< Generate LLVM IR, but do not emit anything. diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index 54150e426b..5ef72d486e 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -373,10 +373,7 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action, raw_ostream *OS) { break; case Backend_EmitBC: - case Backend_EmitBCVerify: getPerModulePasses()->add(createBitcodeWriterPass(*OS)); - if (Action == Backend_EmitBCVerify) - getPerModulePasses()->add(createBitcodeVerifierPass(*OS)); break; case Backend_EmitLL: diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp index 3d21ef9af3..2ddcc3e5dc 100644 --- a/lib/CodeGen/CodeGenAction.cpp +++ b/lib/CodeGen/CodeGenAction.cpp @@ -301,7 +301,6 @@ static raw_ostream *GetOutputStream(CompilerInstance &CI, case Backend_EmitLL: return CI.createDefaultOutputFile(false, InFile, "ll"); case Backend_EmitBC: - case Backend_EmitBCVerify: return CI.createDefaultOutputFile(true, InFile, "bc"); case Backend_EmitNothing: return 0; @@ -413,9 +412,6 @@ EmitAssemblyAction::EmitAssemblyAction(llvm::LLVMContext *_VMContext) EmitBCAction::EmitBCAction(llvm::LLVMContext *_VMContext) : CodeGenAction(Backend_EmitBC, _VMContext) {} -EmitBCVerifyAction::EmitBCVerifyAction(llvm::LLVMContext *_VMContext) - : CodeGenAction(Backend_EmitBCVerify, _VMContext) {} - EmitLLVMAction::EmitLLVMAction(llvm::LLVMContext *_VMContext) : CodeGenAction(Backend_EmitLL, _VMContext) {} diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 85475ad02b..797147e5af 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -406,7 +406,6 @@ static const char *getActionName(frontend::ActionKind Kind) { case frontend::DumpTokens: return "-dump-tokens"; case frontend::EmitAssembly: return "-S"; case frontend::EmitBC: return "-emit-llvm-bc"; - case frontend::EmitBCVerify: return "-emit-llvm-bc-verify"; case frontend::EmitHTML: return "-emit-html"; case frontend::EmitLLVM: return "-emit-llvm"; case frontend::EmitLLVMOnly: return "-emit-llvm-only"; @@ -1270,8 +1269,6 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, Opts.ProgramAction = frontend::EmitAssembly; break; case OPT_emit_llvm_bc: Opts.ProgramAction = frontend::EmitBC; break; - case OPT_emit_llvm_bc_verify: - Opts.ProgramAction = frontend::EmitBCVerify; break; case OPT_emit_html: Opts.ProgramAction = frontend::EmitHTML; break; case OPT_emit_llvm: diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 52c5624c16..fec12e3b11 100644 --- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -43,7 +43,6 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) { case DumpTokens: return new DumpTokensAction(); case EmitAssembly: return new EmitAssemblyAction(); case EmitBC: return new EmitBCAction(); - case EmitBCVerify: return new EmitBCVerifyAction(); case EmitHTML: return new HTMLPrintAction(); case EmitLLVM: return new EmitLLVMAction(); case EmitLLVMOnly: return new EmitLLVMOnlyAction(); |