moire test

Created using spr 1.3.7

Author: fmayer

llvm/lib/Passes/PassBuilder.cpp

@@ -1604,12 +1604,6 @@ parseBoundsCheckingOptions(StringRef Params) {
           /*MayReturn=*/true,
           /*HandlerPreserveAllRegs=*/false,
       };
-    } else if (ParamName == "min-rt-handler-preserve-all-regs") {
-      Options.Rt = {
-          /*MinRuntime=*/true,
-          /*MayReturn=*/true,
-          /*HandlerPreserveAllRegs=*/true,
-      };
     } else if (ParamName == "min-rt-abort") {
       Options.Rt = {
           /*MinRuntime=*/true,
@@ -1618,6 +1612,9 @@ parseBoundsCheckingOptions(StringRef Params) {
       };
     } else if (ParamName == "merge") {
       Options.Merge = true;
+    } else if (ParamName == "handler-preserve-all-regs") {
+      if (Options.Rt)
+        Options.Rt->HandlerPreserveAllRegs = true;
     } else {
       StringRef ParamEQ;
       StringRef Val;

llvm/test/Instrumentation/BoundsChecking/runtimes.ll

@@ -8,7 +8,12 @@
 ; RUN: opt < %s -passes='bounds-checking<rt-abort>'     -S | FileCheck %s --check-prefixes=RTABORT-NOMERGE
 ; RUN: opt < %s -passes='bounds-checking<min-rt>'       -S | FileCheck %s --check-prefixes=MINRT-NOMERGE
 ; RUN: opt < %s -passes='bounds-checking<min-rt-abort>' -S | FileCheck %s --check-prefixes=MINRTABORT-NOMERGE
-; RUN: opt < %s -passes='bounds-checking<min-rt-handler-preserve-all-regs>' -S | FileCheck %s --check-prefixes=MINRT-PRESERVE-NOMERGE
+
+; RUN: opt < %s -passes='bounds-checking<trap;handler-preserve-all-regs>'         -S | FileCheck %s --check-prefixes=TR-NOMERGE
+; RUN: opt < %s -passes='bounds-checking<rt;handler-preserve-all-regs>'           -S | FileCheck %s --check-prefixes=RT-NOMERGE
+; RUN: opt < %s -passes='bounds-checking<rt-abort;handler-preserve-all-regs>'     -S | FileCheck %s --check-prefixes=RTABORT-NOMERGE
+; RUN: opt < %s -passes='bounds-checking<min-rt;handler-preserve-all-regs>'       -S | FileCheck %s --check-prefixes=MINRT-PRESERVE-NOMERGE
+; RUN: opt < %s -passes='bounds-checking<min-rt-abort;handler-preserve-all-regs>' -S | FileCheck %s --check-prefixes=MINRTABORT-NOMERGE
 ;
 ; RUN: opt < %s -passes='bounds-checking<trap;guard=3>'   -S | FileCheck %s --check-prefixes=TR-GUARD-COMMON,TR-GUARD-THREE
 ; RUN: opt < %s -passes='bounds-checking<trap;guard=13>'   -S | FileCheck %s --check-prefixes=TR-GUARD-COMMON,TR-GUARD-THIRTEEN