# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1352889857 -3600
# Node ID b03db3c97f748398ea3247fe6f7b28742b50ffae
# Parent  e54fcd0405f69a68f403015d76451fdcd64a6519# Parent  5bbe9618118e78d23dadd19d91a36514fe361ba3
Merge.

diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/MonitorSnippets.java
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Wed Nov 14 11:29:32 2012 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Wed Nov 14 11:44:17 2012 +0100
@@ -29,6 +29,7 @@
 
 /**
  * Load of a value from a location specified as an offset relative to an object.
+ * No null check is performed before the load.
  */
 public class UnsafeLoadNode extends FixedWithNextNode implements Lowerable {
 
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Wed Nov 14 11:29:32 2012 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Wed Nov 14 11:44:17 2012 +0100
@@ -29,6 +29,7 @@
 
 /**
  * Store of a value at a location specified as an offset relative to an object.
+ * No null check is performed before the store.
  */
 public class UnsafeStoreNode extends FixedWithNextNode implements StateSplit, Lowerable {
 
diff -r e54fcd0405f6 -r b03db3c97f74 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Wed Nov 14 11:29:32 2012 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Wed Nov 14 11:44:17 2012 +0100
@@ -67,7 +67,7 @@
     public static float   ProbabilityCapForInlining          = 1f;
 
     // escape analysis settings
-    public static boolean PartialEscapeAnalysis              = false;
+    public static boolean PartialEscapeAnalysis              = true;
     public static boolean EscapeAnalysisHistogram            = ____;
     public static int     EscapeAnalysisIterations           = 2;
     public static String  EscapeAnalyzeOnly                  = null;