# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1424260197 -3600
# Node ID b7c9c23f7205084f907a3a1046a9a9e03a5a3d54
# Parent  880717e44675986ab71d0e00f1314d017aca0586# Parent  a95544db6f9c794832d780da5f1b33e9325b72ea
Merge.

diff -r 880717e44675 -r b7c9c23f7205 graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Wed Feb 18 12:12:26 2015 +0100
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Wed Feb 18 12:49:57 2015 +0100
@@ -109,7 +109,7 @@
             }
         }
         selectedProcessors = Math.max(1, selectedProcessors);
-        compileQueue = new ThreadPoolExecutor(2, 2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), factory);
+        compileQueue = new ThreadPoolExecutor(selectedProcessors, selectedProcessors, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), factory);
 
     }
 
diff -r 880717e44675 -r b7c9c23f7205 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Wed Feb 18 12:12:26 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Wed Feb 18 12:49:57 2015 +0100
@@ -113,7 +113,11 @@
 
     @Override
     public MaterializedFrame createMaterializedFrame(Object[] arguments, FrameDescriptor frameDescriptor) {
-        return new FrameWithBoxing(frameDescriptor, arguments);
+        if (TruffleCompilerOptions.TruffleUseFrameWithoutBoxing.getValue()) {
+            return new FrameWithoutBoxing(frameDescriptor, arguments);
+        } else {
+            return new FrameWithBoxing(frameDescriptor, arguments);
+        }
     }
 
     @Override
diff -r 880717e44675 -r b7c9c23f7205 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Wed Feb 18 12:12:26 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Wed Feb 18 12:49:57 2015 +0100
@@ -186,16 +186,18 @@
             }
         });
 
-        // FrameWithoutBoxing.class
-        r = new Registration(plugins, metaAccess, FrameWithoutBoxing.class);
-        registerMaterialize(r);
-        registerUnsafeCast(r);
-        registerUnsafeLoadStorePlugins(r, Kind.Int, Kind.Long, Kind.Float, Kind.Double, Kind.Object);
-
-        // FrameWithBoxing.class
-        r = new Registration(plugins, metaAccess, FrameWithBoxing.class);
-        registerMaterialize(r);
-        registerUnsafeCast(r);
+        if (TruffleCompilerOptions.TruffleUseFrameWithoutBoxing.getValue()) {
+            // FrameWithoutBoxing.class
+            r = new Registration(plugins, metaAccess, FrameWithoutBoxing.class);
+            registerMaterialize(r);
+            registerUnsafeCast(r);
+            registerUnsafeLoadStorePlugins(r, Kind.Int, Kind.Long, Kind.Float, Kind.Double, Kind.Object);
+        } else {
+            // FrameWithBoxing.class
+            r = new Registration(plugins, metaAccess, FrameWithBoxing.class);
+            registerMaterialize(r);
+            registerUnsafeCast(r);
+        }
 
         // CompilerDirectives.class
         r = new Registration(plugins, metaAccess, UnsafeAccessImpl.class);