Don't try to handle no-min-bits

Author: arsenm

llvm/lib/Passes/PassBuilder.cpp

@@ -1053,13 +1053,7 @@ Expected<ScalarizerPassOptions> parseScalarizerOptions(StringRef Params) {
     StringRef ParamName;
     std::tie(ParamName, Params) = Params.split(';');
 
-    bool Enable = !ParamName.consume_front("no-");
-
-    if (ParamName == "load-store")
-      Result.ScalarizeLoadStore = Enable;
-    else if (ParamName == "variable-insert-extract")
-      Result.ScalarizeVariableInsertExtract = Enable;
-    else if (Enable && ParamName.consume_front("min-bits=")) {
+    if (ParamName.consume_front("min-bits=")) {
       if (ParamName.getAsInteger(0, Result.ScalarizeMinBits)) {
         return make_error<StringError>(
             formatv("invalid argument to Scalarizer pass min-bits "
@@ -1068,6 +1062,16 @@ Expected<ScalarizerPassOptions> parseScalarizerOptions(StringRef Params) {
                 .str(),
             inconvertibleErrorCode());
       }
+
+      continue;
+    }
+
+    bool Enable = !ParamName.consume_front("no-");
+    if (ParamName == "load-store")
+      Result.ScalarizeLoadStore = Enable;
+    else if (ParamName == "variable-insert-extract")
+      Result.ScalarizeVariableInsertExtract = Enable;
+    else
     } else {
       return make_error<StringError>(
           formatv("invalid Scalarizer pass parameter '{0}' ", ParamName).str(),

llvm/lib/Passes/PassRegistry.def

@@ -577,7 +577,7 @@ FUNCTION_PASS_WITH_PARAMS(
     [](ScalarizerPassOptions Opts) { return ScalarizerPass(Opts); },
     parseScalarizerOptions,
     "load-store;no-load-store;variable-insert-extract;"
-    "no-variable-insert-extract;no-min-bits=N;min-bits=N;")
+    "no-variable-insert-extract;min-bits=N;")
 FUNCTION_PASS_WITH_PARAMS(
     "separate-const-offset-from-gep", "SeparateConstOffsetFromGEPPass",
     [](bool LowerGEP) { return SeparateConstOffsetFromGEPPass(LowerGEP); },

llvm/test/Transforms/Scalarizer/pass-param-parse-errors.ll

@@ -2,6 +2,7 @@
 ; RUN: not opt -passes='scalarizer<;>' -disable-output %s 2>&1 | FileCheck -check-prefix=UNKNOWNERR %s
 ; RUN: not opt -passes='scalarizer<min-bits=>' -disable-output %s 2>&1 | FileCheck -check-prefix=MINBITS-EMPTY-ERR %s
 ; RUN: not opt -passes='scalarizer<min-bits=x>' -disable-output %s 2>&1 | FileCheck -check-prefix=MINBITS-NOTINT-ERR %s
+; RUN: not opt -passes='scalarizer<no-min-bits=10>' -disable-output %s 2>&1 | FileCheck -check-prefix=UNKNOWNERR %s
 
 ; UNKNOWNERR: invalid Scalarizer pass parameter '{{.*}}'
 ; MINBITS-EMPTY-ERR: invalid argument to Scalarizer pass min-bits parameter: ''