From af12138d10920d5cdae9c0415901dcaab1351599 Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <stoklund@2pi.dk>
Date: Tue, 19 Apr 2011 17:17:58 +0000
Subject: [PATCH] Force the greedy register allocator to be linked alongside
 linear scan.

This means that the new register allocator can be used with 'clang -mllvm -regalloc=greedy'.

llvm-svn: 129764
---
 llvm/lib/CodeGen/Passes.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/llvm/lib/CodeGen/Passes.cpp b/llvm/lib/CodeGen/Passes.cpp
index 3489db2e9f4f..c62227535fc9 100644
--- a/llvm/lib/CodeGen/Passes.cpp
+++ b/llvm/lib/CodeGen/Passes.cpp
@@ -55,6 +55,11 @@ FunctionPass *llvm::createRegisterAllocator(CodeGenOpt::Level OptLevel) {
     RegisterRegAlloc::setDefault(RegAlloc);
   }
 
+  // This forces linking of the greedy register allocator, so -regalloc=greedy
+  // works in clang.
+  if (Ctor == createGreedyRegisterAllocator)
+    return createGreedyRegisterAllocator();
+
   if (Ctor != createDefaultRegisterAllocator)
     return Ctor();