diff src/share/vm/ci/bcEscapeAnalyzer.cpp @ 6988:2cb439954abf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 19 Nov 2012 15:36:13 +0100
parents bb33c6fdcf0d
children c90c698831d7
line wrap: on
line diff
--- a/src/share/vm/ci/bcEscapeAnalyzer.cpp	Sun Nov 18 22:45:43 2012 +0100
+++ b/src/share/vm/ci/bcEscapeAnalyzer.cpp	Mon Nov 19 15:36:13 2012 +0100
@@ -282,7 +282,7 @@
   ciMethod* inline_target = NULL;
   if (target->is_loaded() && klass->is_loaded()
       && (klass->is_initialized() || klass->is_interface() && target->holder()->is_initialized())
-      && target->will_link(klass, callee_holder, code)) {
+      && target->is_loaded()) {
     if (code == Bytecodes::_invokestatic
         || code == Bytecodes::_invokespecial
         || code == Bytecodes::_invokevirtual && target->is_final_method()) {