Mercurial > hg > graal-compiler
comparison src/share/vm/opto/runtime.cpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | f2aebc22372a e76dd894b984 |
children | 6b0fd0964b87 |
comparison
equal
deleted
inserted
replaced
10086:e0fb8a213650 | 10408:836a62f43af9 |
---|---|
132 RegisterMap map(thread, false); | 132 RegisterMap map(thread, false); |
133 frame caller = thread->last_frame().sender(&map); | 133 frame caller = thread->last_frame().sender(&map); |
134 assert(caller.is_compiled_frame(), "not being called from compiled like code"); | 134 assert(caller.is_compiled_frame(), "not being called from compiled like code"); |
135 return true; | 135 return true; |
136 } | 136 } |
137 #endif | 137 #endif // ASSERT |
138 | 138 |
139 | 139 |
140 #define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \ | 140 #define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \ |
141 var = generate_stub(env, type_func_gen, CAST_FROM_FN_PTR(address, c_func), #var, fancy_jump, pass_tls, save_arg_regs, return_pc) | 141 var = generate_stub(env, type_func_gen, CAST_FROM_FN_PTR(address, c_func), #var, fancy_jump, pass_tls, save_arg_regs, return_pc) |
142 | 142 |