Mercurial > hg > graal-compiler

diff src/share/vm/graal/graalCodeInstaller.cpp @ 21526:1da7aef31a08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
created com.oracle.graal.hotspot.jvmci package and moved classes destined for future JVMCI module into it (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Tue, 19 May 2015 23:16:07 +0200
parents c8166c23047d
children
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Tue May 26 16:46:25 2015 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Tue May 19 23:16:07 2015 +0200
@@ -450,8 +450,8 @@
   int stack_slots = _total_frame_size / HeapWordSize; // conversion to words
 
   GraalEnv::CodeInstallResult result;
-  if (compiled_code->is_a(HotSpotCompiledRuntimeStub::klass())) {
-    oop stubName = HotSpotCompiledRuntimeStub::stubName(compiled_code);
+  if (!compiled_code->is_a(HotSpotCompiledNmethod::klass())) {
+    oop stubName = CompilationResult::name(HotSpotCompiledCode::comp(compiled_code_obj));
     char* name = strdup(java_lang_String::as_utf8_string(stubName));
     cb = RuntimeStub::new_runtime_stub(name,
                                        &buffer,
@@ -490,7 +490,7 @@
     _parameter_count = method->size_of_parameters();
     TRACE_graal_1("installing code for %s", method->name_and_sig_as_C_string());
   } else {
-    assert(compiled_code->is_a(HotSpotCompiledRuntimeStub::klass()), "CCE");
+    // Must be a HotSpotCompiledRuntimeStub
     // TODO (ds) not sure if this is correct - only used in OopMap constructor for non-product builds
     _parameter_count = 0;
   }
@@ -878,7 +878,7 @@
   oop hotspot_method = NULL; // JavaMethod
   oop foreign_call = NULL;
 
-  if (target_klass->is_subclass_of(SystemDictionary::HotSpotForeignCallLinkageImpl_klass())) {
+  if (target_klass->is_subclass_of(SystemDictionary::HotSpotForeignCallTarget_klass())) {
     foreign_call = target;
   } else {
     hotspot_method = target;
@@ -897,7 +897,7 @@
   }
 
   if (foreign_call != NULL) {
-    jlong foreign_call_destination = HotSpotForeignCallLinkageImpl::address(foreign_call);
+    jlong foreign_call_destination = HotSpotForeignCallTarget::address(foreign_call);
     CodeInstaller::pd_relocate_ForeignCall(inst, foreign_call_destination);
   } else { // method != NULL
     assert(hotspot_method != NULL, "unexpected JavaMethod");