Mercurial > hg > graal-compiler

comparison src/share/vm/c1/c1_Runtime1.cpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 04b9a2566eec
children 8021e46f4a99
comparison
equal deleted inserted replaced
4558:3706975946e4 4559:723df37192d6
460 JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* thread, oopDesc* ex, address pc, nmethod*& nm)) 460 JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* thread, oopDesc* ex, address pc, nmethod*& nm))
461 // Reset method handle flag. 461 // Reset method handle flag.
462 thread->set_is_method_handle_return(false); 462 thread->set_is_method_handle_return(false);
463 463
464 Handle exception(thread, ex); 464 Handle exception(thread, ex);
465 if (UseGraal && exception.is_null()) { 465 #ifdef GRAAL
466 if (exception.is_null()) {
466 exception = Exceptions::new_exception(thread, vmSymbols::java_lang_NullPointerException(), NULL); 467 exception = Exceptions::new_exception(thread, vmSymbols::java_lang_NullPointerException(), NULL);
467 } 468 }
469 #endif
468 nm = CodeCache::find_nmethod(pc); 470 nm = CodeCache::find_nmethod(pc);
469 assert(nm != NULL, "this is not an nmethod"); 471 assert(nm != NULL, "this is not an nmethod");
470 // Adjust the pc as needed/ 472 // Adjust the pc as needed/
471 if (nm->is_deopt_pc(pc)) { 473 if (nm->is_deopt_pc(pc)) {
472 RegisterMap map(thread, false); 474 RegisterMap map(thread, false);