Merge rust-lang#30

30: Force emission of a branch in FastISel. r=ltratt a=vext01



Co-authored-by: Edd Barrett <[email protected]>

Author: bors[bot]

llvm/lib/CodeGen/CodeGen.cpp

@@ -14,9 +14,16 @@
 #include "llvm-c/Initialization.h"
 #include "llvm/InitializePasses.h"
 #include "llvm/PassRegistry.h"
+#include "llvm/Support/CommandLine.h"
 
 using namespace llvm;
 
+llvm::cl::opt<bool> YkNoFallThrough(
+    "yk-no-fallthrough", cl::Hidden, 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"));
+
 /// initializeCodeGen - Initialize all passes linked into the CodeGen library.
 void llvm::initializeCodeGen(PassRegistry &Registry) {
   initializeAtomicExpandPass(Registry);

llvm/lib/CodeGen/SelectionDAG/FastISel.cpp

@@ -111,6 +111,8 @@
 using namespace llvm;
 using namespace PatternMatch;
 
+extern cl::opt<bool> YkNoFallThrough;
+
 #define DEBUG_TYPE "isel"
 
 STATISTIC(NumFastIselSuccessIndependent, "Number of insts selected by "
@@ -1576,7 +1578,7 @@ bool FastISel::selectInstruction(const Instruction *I) {
 /// (fall-through) successor, and update the CFG.
 void FastISel::fastEmitBranch(MachineBasicBlock *MSucc,
                               const DebugLoc &DbgLoc) {
-  if (FuncInfo.MBB->getBasicBlock()->sizeWithoutDebug() > 1 &&
+  if ((!YkNoFallThrough) && (FuncInfo.MBB->getBasicBlock()->sizeWithoutDebug() > 1) &&
       FuncInfo.MBB->isLayoutSuccessor(MSucc)) {
     // For more accurate line information if this is the only non-debug
     // instruction in the block then emit it, otherwise we have the

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

@@ -135,11 +135,7 @@ static cl::opt<unsigned> SwitchPeelThreshold(
              "switch statement. A value greater than 100 will void this "
              "optimization"));
 
-static cl::opt<bool> YkNoFallThrough(
-    "yk-no-fallthrough", cl::Hidden, 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"));
+extern cl::opt<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