comparison src/share/vm/graal/graalCompilerToVM.cpp @ 9460:56c12e0c15c1

Merge.
author Doug Simon <doug.simon@oracle.com>
date Tue, 30 Apr 2013 22:22:42 +0200
parents 3e7d22d31f7e fd60b73f1759
children 902a974d55c8
comparison
equal deleted inserted replaced
9459:c021bfc839e6 9460:56c12e0c15c1
800 set_int("deoptReasonNotCompiledExceptionHandler", Deoptimization::Reason_not_compiled_exception_handler); 800 set_int("deoptReasonNotCompiledExceptionHandler", Deoptimization::Reason_not_compiled_exception_handler);
801 set_int("deoptReasonUnresolved", Deoptimization::Reason_unresolved); 801 set_int("deoptReasonUnresolved", Deoptimization::Reason_unresolved);
802 set_int("deoptReasonJsrMismatch", Deoptimization::Reason_jsr_mismatch); 802 set_int("deoptReasonJsrMismatch", Deoptimization::Reason_jsr_mismatch);
803 set_int("deoptReasonDiv0Check", Deoptimization::Reason_div0_check); 803 set_int("deoptReasonDiv0Check", Deoptimization::Reason_div0_check);
804 set_int("deoptReasonConstraint", Deoptimization::Reason_constraint); 804 set_int("deoptReasonConstraint", Deoptimization::Reason_constraint);
805 set_int("deoptReasonLoopLimitCheck", Deoptimization::Reason_loop_limit_check);
805 806
806 set_int("deoptActionNone", Deoptimization::Action_none); 807 set_int("deoptActionNone", Deoptimization::Action_none);
807 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile); 808 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile);
808 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret); 809 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret);
809 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant); 810 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant);