# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1353923499 -3600
# Node ID e5ec98288b9166d1b735724288b4537b0000df8c
# Parent  263bc2349f15929e73e3c63a25ed1d930df6f285
minor changes

diff -r 263bc2349f15 -r e5ec98288b91 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java	Fri Nov 23 14:08:03 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java	Mon Nov 26 10:51:39 2012 +0100
@@ -540,6 +540,7 @@
             assert loadHub.kind() == wordKind;
             LocationNode location = LocationNode.create(LocationNode.FINAL_LOCATION, wordKind, config.hubOffset, graph);
             ValueNode object = loadHub.object();
+            assert !object.isConstant();
             ValueNode guard = tool.createNullCheckGuard(object, StructuredGraph.INVALID_GRAPH_ID);
             ReadNode hub = graph.add(new ReadNode(object, location, wordStamp()));
             hub.dependencies().add(guard);
@@ -568,6 +569,7 @@
             newObjectSnippets.lower((NewMultiArrayNode) n, tool);
         } else {
             assert false : "Node implementing Lowerable not handled: " + n;
+            throw GraalInternalError.shouldNotReachHere();
         }
     }
 
diff -r 263bc2349f15 -r e5ec98288b91 src/share/vm/graal/graalEnv.cpp
--- a/src/share/vm/graal/graalEnv.cpp	Fri Nov 23 14:08:03 2012 +0100
+++ b/src/share/vm/graal/graalEnv.cpp	Mon Nov 26 10:51:39 2012 +0100
@@ -177,7 +177,7 @@
     {
       // We have to lock the cpool to keep the oop from being resolved
       // while we are accessing it.
-      MutexLockerEx ml(cpool->lock());
+      MutexLockerEx ml(cpool->lock(), Mutex::_no_safepoint_check_flag);
 
       constantTag tag = cpool->tag_at(index);
       if (tag.is_klass()) {