Mercurial > hg > truffle
comparison src/share/vm/runtime/compilationPolicy.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | cefad50507d8 |
children | de839ec35cc7 |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
478 if (is_compilation_enabled() && can_be_osr_compiled(m, comp_level)) { | 478 if (is_compilation_enabled() && can_be_osr_compiled(m, comp_level)) { |
479 CompileBroker::compile_method(m, bci, comp_level, m, hot_count, comment, thread); | 479 CompileBroker::compile_method(m, bci, comp_level, m, hot_count, comment, thread); |
480 NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, comp_level, true));) | 480 NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, comp_level, true));) |
481 } | 481 } |
482 } | 482 } |
483 | |
484 // StackWalkCompPolicy - walk up stack to find a suitable method to compile | 483 // StackWalkCompPolicy - walk up stack to find a suitable method to compile |
485 | 484 |
486 #ifdef COMPILER2 | 485 #ifdef COMPILER2 |
487 const char* StackWalkCompPolicy::_msg = NULL; | 486 const char* StackWalkCompPolicy::_msg = NULL; |
488 | 487 |