1.1 --- a/src/share/vm/opto/runtime.cpp Fri Oct 11 10:14:02 2013 -0700
1.2 +++ b/src/share/vm/opto/runtime.cpp Thu Oct 10 15:44:12 2013 +0200
1.3 @@ -138,9 +138,10 @@
1.4
1.5
1.6 #define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \
1.7 - var = generate_stub(env, type_func_gen, CAST_FROM_FN_PTR(address, c_func), #var, fancy_jump, pass_tls, save_arg_regs, return_pc)
1.8 + var = generate_stub(env, type_func_gen, CAST_FROM_FN_PTR(address, c_func), #var, fancy_jump, pass_tls, save_arg_regs, return_pc); \
1.9 + if (var == NULL) { return false; }
1.10
1.11 -void OptoRuntime::generate(ciEnv* env) {
1.12 +bool OptoRuntime::generate(ciEnv* env) {
1.13
1.14 generate_exception_blob();
1.15
1.16 @@ -158,7 +159,7 @@
1.17 gen(env, _multianewarrayN_Java , multianewarrayN_Type , multianewarrayN_C , 0 , true , false, false);
1.18 gen(env, _g1_wb_pre_Java , g1_wb_pre_Type , SharedRuntime::g1_wb_pre , 0 , false, false, false);
1.19 gen(env, _g1_wb_post_Java , g1_wb_post_Type , SharedRuntime::g1_wb_post , 0 , false, false, false);
1.20 - gen(env, _complete_monitor_locking_Java , complete_monitor_enter_Type , SharedRuntime::complete_monitor_locking_C , 0 , false, false, false);
1.21 + gen(env, _complete_monitor_locking_Java , complete_monitor_enter_Type , SharedRuntime::complete_monitor_locking_C, 0, false, false, false);
1.22 gen(env, _rethrow_Java , rethrow_Type , rethrow_C , 2 , true , false, true );
1.23
1.24 gen(env, _slow_arraycopy_Java , slow_arraycopy_Type , SharedRuntime::slow_arraycopy_C , 0 , false, false, false);
1.25 @@ -168,7 +169,7 @@
1.26 gen(env, _zap_dead_Java_locals_Java , zap_dead_locals_Type , zap_dead_Java_locals_C , 0 , false, true , false );
1.27 gen(env, _zap_dead_native_locals_Java , zap_dead_locals_Type , zap_dead_native_locals_C , 0 , false, true , false );
1.28 # endif
1.29 -
1.30 + return true;
1.31 }
1.32
1.33 #undef gen
