From: Andrew Trick <atrick@apple.com>
Date: Tue, 13 Nov 2012 22:15:40 +0000 (+0000)
Subject: The MachineScheduler does not currently require JoinSplitEdges.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3106aa125eb2756083e950362b6769b87cb3430a;p=oota-llvm.git

The MachineScheduler does not currently require JoinSplitEdges.

This option will eventually either be enabled unconditionally or
replaced by a more general live range splitting optimization.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167879 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/RegisterCoalescer.cpp b/lib/CodeGen/RegisterCoalescer.cpp
index 5ec0aece1e5..b7839d6b0e6 100644
--- a/lib/CodeGen/RegisterCoalescer.cpp
+++ b/lib/CodeGen/RegisterCoalescer.cpp
@@ -2116,10 +2116,10 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
   else
     JoinGlobalCopies = (EnableGlobalCopies == cl::BOU_TRUE);
 
-  if (EnableJoinSplits == cl::BOU_UNSET)
-    JoinSplitEdges = ST.enableMachineScheduler();
-  else
-    JoinSplitEdges = (EnableJoinSplits == cl::BOU_TRUE);
+  // The MachineScheduler does not currently require JoinSplitEdges. This will
+  // either be enabled unconditionally or replaced by a more general live range
+  // splitting optimization.
+  JoinSplitEdges = EnableJoinSplits;
 
   DEBUG(dbgs() << "********** SIMPLE REGISTER COALESCING **********\n"
                << "********** Function: " << MF->getName() << '\n');