# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1327070595 -3600
# Node ID d203d8b2572119fa610da062697b20e917367a0b
# Parent  c66ddad845a463529dfea208923c848c4f141bc3
Merge fix.

diff -r c66ddad845a4 -r d203d8b25721 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Fri Jan 20 15:13:32 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Fri Jan 20 15:43:15 2012 +0100
@@ -244,8 +244,12 @@
 
         Debug.scope("Allocator", new Runnable() {
             public void run() {
-                new LinearScanAllocator(lir, frameMap).execute();
-//              new SpillAllAllocator(lir, frameMap).execute();
+                if (GraalOptions.AllocSSA) {
+                    new LinearScanAllocator(lir, frameMap).execute();
+                    // new SpillAllAllocator(context, lir, frameMap).execute();
+                } else {
+                    new LinearScan(target, method, lir, lirGenerator, frameMap).allocate();
+                }
             }
         });
         return frameMap;