# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1376704516 -7200
# Node ID ca5054bbfcdd9d53ab24fecd1c79dbe781f7888a
# Parent  dae9dd07896fb3537fdad1eeada8903f12b89c26# Parent  87cab8081da4503613c92b1492c5856f0e0e302d
Merge.

diff -r dae9dd07896f -r ca5054bbfcdd src/share/vm/graal/graalCodeInstaller.cpp
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Sat Aug 17 01:45:25 2013 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Sat Aug 17 03:55:16 2013 +0200
@@ -732,14 +732,6 @@
   NativeInstruction* inst = nativeInstruction_at(_instructions->start() + pc_offset);
   jint next_pc_offset = CodeInstaller::pd_next_offset(inst, pc_offset, hotspot_method);
   
-  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;
-  }
-
   if (debug_info != NULL) {
     oop frame = DebugInfo::bytecodePosition(debug_info);
     _debug_recorder->add_safepoint(next_pc_offset, create_oop_map(_total_frame_size, _parameter_count, debug_info));