Merge
authorcoleenp
Wed, 02 Mar 2016 17:09:32 +0000
changeset 36393 45a4bd3cfc82
parent 36391 3989ccd3f3de (current diff)
parent 36392 f2f1892bfa98 (diff)
child 36395 12977f0913fd
child 36396 26a241a959de
child 36398 5983833c444a
Merge
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Wed Mar 02 17:08:40 2016 +0100
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Wed Mar 02 17:09:32 2016 +0000
@@ -762,14 +762,6 @@
   ConstantPoolCacheEntry* cp_cache_entry = cache_entry(thread);
   if (cp_cache_entry->is_resolved(bytecode)) return;
 
-  if (bytecode == Bytecodes::_invokeinterface) {
-    if (log_develop_is_enabled(Trace, itables)) {
-      ResourceMark rm(thread);
-      log_develop_trace(itables)("Resolving: klass: %s to method: %s",
-                                 info.resolved_klass()->name()->as_C_string(),
-                                 info.resolved_method()->name()->as_C_string());
-    }
-  }
 #ifdef ASSERT
   if (bytecode == Bytecodes::_invokeinterface) {
     if (info.resolved_method()->method_holder() ==
--- a/hotspot/test/runtime/logging/ItablesTest.java	Wed Mar 02 17:08:40 2016 +0100
+++ b/hotspot/test/runtime/logging/ItablesTest.java	Wed Mar 02 17:09:32 2016 +0000
@@ -49,7 +49,6 @@
             output.shouldContain("invokespecial resolved method: caller-class:ClassB");
             output.shouldContain("invokespecial selected method: resolved-class:ClassB");
             output.shouldContain("invokeinterface selected method: receiver-class");
-            output.shouldContain("Resolving: klass: ");
             output.shouldHaveExitValue(0);
 
             pb = ProcessTools.createJavaProcessBuilder("-Xlog:itables=trace", "ItablesVtableTest");