diff src/share/vm/opto/bytecodeInfo.cpp @ 11173:6b0fd0964b87

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 836a62f43af9 02d7aa1456c9
children cefad50507d8
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp	Tue Jul 30 13:03:28 2013 -0700
+++ b/src/share/vm/opto/bytecodeInfo.cpp	Wed Jul 31 11:00:54 2013 +0200
@@ -301,15 +301,6 @@
     }
   }
 
-  if (UseStringCache) {
-    // Do not inline StringCache::profile() method used only at the beginning.
-    if (callee_method->name() == ciSymbol::profile_name() &&
-        callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) {
-      set_msg("profiling method");
-      return true;
-    }
-  }
-
   // use frequency-based objections only for non-trivial methods
   if (callee_method->code_size() <= MaxTrivialSize) {
     return false;