In the joiner, merge the small interval into the large interval. This restores

[oota-llvm.git] / lib / CodeGen / Passes.cpp

diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp
index 98de0b4c79ce8071f1706a0f293b20623511b1d4..7233e81473b6e033d572ce3adf7180aa18aa37de 100644 (file)
--- a/lib/CodeGen/Passes.cpp
+++ b/lib/CodeGen/Passes.cpp
@@ -23,7 +23,7 @@ namespace {
   cl::opt<RegAllocName>
   RegAlloc(
     "regalloc",
-    cl::desc("Register allocator to use: (default = simple)"),
+    cl::desc("Register allocator to use: (default = linearscan)"),
     cl::Prefix,
     cl::values(
        clEnumVal(simple,        "  simple register allocator"),
@@ -31,7 +31,7 @@ namespace {
        clEnumVal(linearscan,    "  linear scan register allocator"),
        clEnumVal(iterativescan, "  iterative scan register allocator"),
        clEnumValEnd),
-    cl::init(local));
+    cl::init(linearscan));
 }
 
 FunctionPass *llvm::createRegisterAllocator() {