Mercurial > hg > truffle
comparison src/share/vm/runtime/deoptimization.hpp @ 13857:a9604b40f5e7
On HotSpot, debug_id should be an int, not a short
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Mon, 03 Feb 2014 14:47:11 +0100 |
| parents | 5a9afbf72714 |
| children | 7ad529321294 |
comparison
equal
deleted
inserted
replaced
| 13856:2ba54e75b032 | 13857:a9604b40f5e7 |
|---|---|
| 292 ((~(trap_request) >> _action_shift) & right_n_bits(_action_bits)); | 292 ((~(trap_request) >> _action_shift) & right_n_bits(_action_bits)); |
| 293 else | 293 else |
| 294 // standard action for unloaded CP entry | 294 // standard action for unloaded CP entry |
| 295 return _unloaded_action; | 295 return _unloaded_action; |
| 296 } | 296 } |
| 297 static short trap_request_debug_id(int trap_request) { | 297 static int trap_request_debug_id(int trap_request) { |
| 298 if (trap_request < 0) | 298 if (trap_request < 0) |
| 299 return (DeoptAction) | 299 return ((~(trap_request) >> _debug_id_shift) & right_n_bits(_debug_id_bits)); |
| 300 ((~(trap_request) >> _debug_id_shift) & right_n_bits(_debug_id_bits)); | |
| 301 else | 300 else |
| 302 // standard action for unloaded CP entry | 301 // standard action for unloaded CP entry |
| 303 return 0; | 302 return 0; |
| 304 } | 303 } |
| 305 static int trap_request_index(int trap_request) { | 304 static int trap_request_index(int trap_request) { |