[clang] Added a new option '-fdisable-try-stmt'

Author: gmh5225

clang/include/clang/Basic/CodeGenOptions.def

@@ -247,6 +247,7 @@ CODEGENOPT(SanitizeMemoryUseAfterDtor, 1, 0) ///< Enable use-after-delete detect
 CODEGENOPT(SanitizeCfiCrossDso, 1, 0) ///< Enable cross-dso support in CFI.
 CODEGENOPT(Jumptablerdata, 1, 0) ///< Put switch case jump tables in .rdata
 CODEGENOPT(DisableInlineOpt, 1, 0) ///< Disables the optimization of inline functions.
+CODEGENOPT(DisableTryStmt, 1, 0) ///< Disables the try statements.
 CODEGENOPT(DisableCFICheckFail, 1, 0) ///< Disables the failure checks in CFI.
 CODEGENOPT(DisableCFICheck, 1, 0) ///< Disables the checks in CFI.
 CODEGENOPT(DisableCFISlowPathCheck, 1, 0) ///< Disables the slow path checks in CFI.

clang/include/clang/Driver/Options.td

@@ -2439,6 +2439,10 @@ def fdisable_inline_opt : Flag<["-"], "fdisable-inline-opt">,
                                           Group<f_clang_Group>,
                                           HelpText<"Disables the optimization of inline functions">,
                                           MarshallingInfoFlag<CodeGenOpts<"DisableInlineOpt">>;
+def fdisable_try_stmt : Flag<["-"],   "fdisable-try-stmt">,
+                                          Group<f_clang_Group>,
+                                          HelpText<"Disables the try statements">,
+                                          MarshallingInfoFlag<CodeGenOpts<"DisableTryStmt">>;
 def fdisable_cfi_check : Flag<["-"], "fdisable-cfi-check">,
                                           Group<f_clang_Group>,
                                           HelpText<"Disables the checks in CFI">,

clang/lib/CodeGen/CGException.cpp

@@ -630,6 +630,14 @@ void CodeGenFunction::FixSEHEnd(llvm::InvokeInst *InvokeIst) {
 }
 
 void CodeGenFunction::EmitCXXTryStmt(const CXXTryStmt &S) {
+
+  // If try statements are disabled, just emit the try statement as a compound
+  // stmt.
+  if (CGM.getCodeGenOpts().DisableTryStmt) {
+    EmitStmt(S.getTryBlock());
+    return;
+  }
+
   const llvm::Triple &T = Target.getTriple();
   // If we encounter a try statement on in an OpenMP target region offloaded to
   // a GPU, we treat it as a basic block.
@@ -1741,6 +1749,14 @@ llvm::BasicBlock *CodeGenFunction::getEHResumeBlock(bool isCleanup) {
 }
 
 void CodeGenFunction::EmitSEHTryStmt(const SEHTryStmt &S) {
+
+  // If try statements are disabled, just emit the try statement as a compound
+  // stmt.
+  if (CGM.getCodeGenOpts().DisableTryStmt) {
+    EmitStmt(S.getTryBlock());
+    return;
+  }
+  
   bool ContainsRetStmt = false;
   EnterSEHTryStmt(S, ContainsRetStmt);
   {

clang/lib/CodeGen/CodeGenModule.cpp

@@ -1047,6 +1047,11 @@ void CodeGenModule::Release() {
     getModule().addModuleFlag(llvm::Module::Override, "DisableInlineOpt", 1);
   }
 
+  if (CodeGenOpts.DisableTryStmt) {
+    // Indicate that we want to disable the try statements.
+    getModule().addModuleFlag(llvm::Module::Override, "DisableTryStmt", 1);
+  }
+  
   if (CodeGenOpts.Jumptablerdata) {
     // Indicate that we want to emit jump table to .rdata.
     getModule().addModuleFlag(llvm::Module::Override, "Jumptablerdata", 1);

clang/lib/Driver/ToolChains/Clang.cpp

@@ -6797,6 +6797,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (Args.hasArg(options::OPT_fdisable_inline_opt))
     CmdArgs.push_back("-fdisable-inline-opt");
 
+  // -fdisable-try-stmt(Disables the try statements)
+  if (Args.hasArg(options::OPT_fdisable_try_stmt))
+    CmdArgs.push_back("-fdisable-try-stmt");
+  
   // -fdisable-cfi-check(Disables the checks in CFI)
   if (Args.hasArg(options::OPT_fdisable_cfi_check))
     CmdArgs.push_back("-fdisable-cfi-check");