diff src/share/vm/graal/graalCodeInstaller.cpp @ 10860:1b11e3c8529c

Merge.
author Christian Humer <christian.humer@gmail.com>
date Tue, 23 Jul 2013 17:48:17 +0200
parents e1fcdda22831
children b5f6188d79c5
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Tue Jul 23 17:47:56 2013 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Tue Jul 23 17:48:17 2013 +0200
@@ -734,12 +734,9 @@
   
   if (target->is_a(SystemDictionary::HotSpotInstalledCode_klass())) {
     assert(inst->is_jump(), "jump expected");
-
     CodeBlob* cb = (CodeBlob*) (address) HotSpotInstalledCode::codeBlob(target);
     assert(cb != NULL, "npe");
-    
     CodeInstaller::pd_relocate_CodeBlob(cb, inst);
-
     return;
   }
 
@@ -755,7 +752,6 @@
 
   if (foreign_call != NULL) {
     jlong foreign_call_destination = HotSpotForeignCallLinkage::address(foreign_call);
-
     CodeInstaller::pd_relocate_ForeignCall(inst, foreign_call_destination);
   } else { // method != NULL
     assert(hotspot_method != NULL, "unexpected JavaMethod");
@@ -764,7 +760,9 @@
     TRACE_graal_3("method call");
     CodeInstaller::pd_relocate_JavaMethod(hotspot_method, pc_offset);
   }
+
   _next_call_type = MARK_INVOKE_INVALID;
+
   if (debug_info != NULL) {
     _debug_recorder->end_safepoint(next_pc_offset);
   }