Merge rust-lang#46

46: Fix the "-yk-no-fallthrough" flag. r=ltratt a=vext01 Co-authored-by: Edd Barrett <vext01@gmail.com>
vext01 · Sep 23, 2022 · 43cfd81 · 43cfd81
2 parents d4e99bc + ebf2331
commit 43cfd81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/llvm/lib/CodeGen/CodeGen.cpp b/llvm/lib/CodeGen/CodeGen.cpp
@@ -18,8 +18,10 @@
 
 using namespace llvm;
 
-llvm::cl::opt<bool> YkNoFallThrough(
-    "yk-no-fallthrough", cl::Hidden, cl::init(false),
+bool YkNoFallThrough;
+llvm::cl::opt<bool, true> YkNoFallThroughParser(
+    "yk-no-fallthrough", cl::Hidden, cl::location(YkNoFallThrough),
+    cl::init(false),
     cl::desc("Always emit a branch even if fallthrough is possible. This "
              "is required for the yk JIT, so that the machine IR has the "
              "same block structure as the high-level IR"));

diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -110,7 +110,7 @@
 using namespace llvm;
 using namespace PatternMatch;
 
-extern cl::opt<bool> YkNoFallThrough;
+extern bool YkNoFallThrough;
 
 #define DEBUG_TYPE "isel"
 

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -129,7 +129,7 @@ static cl::opt<unsigned> SwitchPeelThreshold(
              "switch statement. A value greater than 100 will void this "
              "optimization"));
 
-extern cl::opt<bool> YkNoFallThrough;
+extern bool YkNoFallThrough;
 
 // Limit the width of DAG chains. This is important in general to prevent
 // DAG-based analysis from blowing up. For example, alias analysis and