# HG changeset patch # User Doug Simon # Date 1339421673 -7200 # Node ID faa9628bb37de4b804922f6e04cf3c32d6f674c7 # Parent 12dc45f4fc14ff4f2c38507b3d40cee53f10239e replaced use of HotSpot fast_new_instance_init_check stub with new_instance_stub as both the XIR and Java snippets include the fast allocation path and the initialization check diff -r 12dc45f4fc14 -r faa9628bb37d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Mon Jun 11 15:32:46 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Mon Jun 11 15:34:33 2012 +0200 @@ -89,7 +89,6 @@ public long debugStub; public long instanceofStub; public long newInstanceStub; - public long unresolvedNewInstanceStub; public long newTypeArrayStub; public long newObjectArrayStub; public long newMultiArrayStub; diff -r 12dc45f4fc14 -r faa9628bb37d src/share/vm/graal/graalCompilerToVM.cpp --- a/src/share/vm/graal/graalCompilerToVM.cpp Mon Jun 11 15:32:46 2012 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Mon Jun 11 15:34:33 2012 +0200 @@ -818,8 +818,7 @@ set_long(env, config, "debugStub", VmIds::addStub((address)warning)); set_long(env, config, "instanceofStub", VmIds::addStub(Runtime1::entry_for(Runtime1::slow_subtype_check_id))); set_long(env, config, "verifyPointerStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_verify_pointer_id))); - set_long(env, config, "newInstanceStub", VmIds::addStub(Runtime1::entry_for(Runtime1::fast_new_instance_init_check_id))); - set_long(env, config, "unresolvedNewInstanceStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_instance_id))); + set_long(env, config, "newInstanceStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_instance_id))); set_long(env, config, "newTypeArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_type_array_id))); set_long(env, config, "newObjectArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_object_array_id))); set_long(env, config, "newMultiArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_multi_array_id)));