Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
10912:4ea54634f03e | 11173:6b0fd0964b87 |
---|---|
295 const InlineTree *top = this; | 295 const InlineTree *top = this; |
296 while (top->caller_tree() != NULL) top = top->caller_tree(); | 296 while (top->caller_tree() != NULL) top = top->caller_tree(); |
297 ciInstanceKlass* k = top->method()->holder(); | 297 ciInstanceKlass* k = top->method()->holder(); |
298 if (!k->is_subclass_of(C->env()->Throwable_klass())) { | 298 if (!k->is_subclass_of(C->env()->Throwable_klass())) { |
299 set_msg("exception method"); | 299 set_msg("exception method"); |
300 return true; | |
301 } | |
302 } | |
303 | |
304 if (UseStringCache) { | |
305 // Do not inline StringCache::profile() method used only at the beginning. | |
306 if (callee_method->name() == ciSymbol::profile_name() && | |
307 callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) { | |
308 set_msg("profiling method"); | |
309 return true; | 300 return true; |
310 } | 301 } |
311 } | 302 } |
312 | 303 |
313 // use frequency-based objections only for non-trivial methods | 304 // use frequency-based objections only for non-trivial methods |