Mercurial > hg > truffle
comparison src/share/vm/opto/parse1.cpp @ 7194:beebba0acc11
7172640: C2: instrinsic implementations in LibraryCallKit should use argument() instead of pop()
Reviewed-by: kvn, jrose
author | twisti |
---|---|
date | Mon, 26 Nov 2012 17:25:11 -0800 |
parents | c3e799c37717 |
children | 2aff40cb4703 |
comparison
equal
deleted
inserted
replaced
7193:ee32440febeb | 7194:beebba0acc11 |
---|---|
1006 } | 1006 } |
1007 | 1007 |
1008 // If this is an inlined method, we may have to do a receiver null check. | 1008 // If this is an inlined method, we may have to do a receiver null check. |
1009 if (_caller->has_method() && is_normal_parse() && !method()->is_static()) { | 1009 if (_caller->has_method() && is_normal_parse() && !method()->is_static()) { |
1010 GraphKit kit(_caller); | 1010 GraphKit kit(_caller); |
1011 kit.null_check_receiver(method()); | 1011 kit.null_check_receiver_before_call(method()); |
1012 _caller = kit.transfer_exceptions_into_jvms(); | 1012 _caller = kit.transfer_exceptions_into_jvms(); |
1013 if (kit.stopped()) { | 1013 if (kit.stopped()) { |
1014 _exits.add_exception_states_from(_caller); | 1014 _exits.add_exception_states_from(_caller); |
1015 _exits.set_jvms(_caller); | 1015 _exits.set_jvms(_caller); |
1016 return NULL; | 1016 return NULL; |
1396 NOT_PRODUCT( parse_histogram()->set_initial_state(bc()); ); | 1396 NOT_PRODUCT( parse_histogram()->set_initial_state(bc()); ); |
1397 | 1397 |
1398 #ifdef ASSERT | 1398 #ifdef ASSERT |
1399 int pre_bc_sp = sp(); | 1399 int pre_bc_sp = sp(); |
1400 int inputs, depth; | 1400 int inputs, depth; |
1401 bool have_se = !stopped() && compute_stack_effects(inputs, depth, /*for_parse*/ true); | 1401 bool have_se = !stopped() && compute_stack_effects(inputs, depth); |
1402 assert(!have_se || pre_bc_sp >= inputs, err_msg_res("have enough stack to execute this BC: pre_bc_sp=%d, inputs=%d", pre_bc_sp, inputs)); | 1402 assert(!have_se || pre_bc_sp >= inputs, err_msg_res("have enough stack to execute this BC: pre_bc_sp=%d, inputs=%d", pre_bc_sp, inputs)); |
1403 #endif //ASSERT | 1403 #endif //ASSERT |
1404 | 1404 |
1405 do_one_bytecode(); | 1405 do_one_bytecode(); |
1406 | 1406 |