Mercurial > hg > truffle

changeset 11341:ca5054bbfcdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Aug 2013 03:55:16 +0200
parents dae9dd07896f (current diff) 87cab8081da4 (diff)
children 35e2bfe0ca84 4b3a6662deb1
files
diffstat 1 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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));