Mercurial > hg > truffle

comparison src/share/vm/c1/c1_Runtime1.cpp @ 8886:f69a72df4939

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sun, 07 Apr 2013 14:53:18 +0200
parents b9a918201d47
children 836a62f43af9
comparison
equal deleted inserted replaced
8885:4877c7dfe6d6 8886:f69a72df4939
1369 m->print_short_name(&ss2); 1369 m->print_short_name(&ss2);
1370 tty->print_cr("Predicate failed trap in method %s at bci %d inlined in %s at pc %x", ss1.as_string(), vfst.bci(), ss2.as_string(), caller_frame.pc()); 1370 tty->print_cr("Predicate failed trap in method %s at bci %d inlined in %s at pc %x", ss1.as_string(), vfst.bci(), ss2.as_string(), caller_frame.pc());
1371 } 1371 }
1372 1372
1373 1373
1374 Deoptimization::deoptimize_frame(thread, caller_frame.id()); 1374 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_none);
1375 1375
1376 JRT_END 1376 JRT_END
1377 1377
1378 #ifndef PRODUCT 1378 #ifndef PRODUCT
1379 void Runtime1::print_statistics() { 1379 void Runtime1::print_statistics() {