Mercurial > hg > truffle
diff src/share/vm/runtime/vframeArray.hpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Wed, 15 Oct 2014 16:02:50 +0200 |
| parents | 89152779163c 0bf37f737702 |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/src/share/vm/runtime/vframeArray.hpp Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/vm/runtime/vframeArray.hpp Wed Oct 15 16:02:50 2014 +0200 @@ -85,10 +85,8 @@ // Returns the on stack word size for this frame // callee_parameters is the number of callee locals residing inside this frame - int on_stack_size(int caller_actual_parameters, - int callee_parameters, + int on_stack_size(int callee_parameters, int callee_locals, - bool is_bottom_frame, bool is_top_frame, int popframe_extra_stack_expression_els) const;