Mercurial > hg > graal-compiler
changeset 4360:d203d8b25721
Merge fix.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 20 Jan 2012 15:43:15 +0100 |
parents | c66ddad845a4 |
children | 18b52fec79f1 |
files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;