Mercurial > hg > truffle

changeset 13857:a9604b40f5e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2ba54e75b032
children 6b91134526a7
files src/share/vm/runtime/deoptimization.cpp src/share/vm/runtime/deoptimization.hpp
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp	Sun Feb 02 18:47:02 2014 +0100
+++ b/src/share/vm/runtime/deoptimization.cpp	Mon Feb 03 14:47:11 2014 +0100
@@ -1347,7 +1347,7 @@
     DeoptReason reason = trap_request_reason(trap_request);
     DeoptAction action = trap_request_action(trap_request);
 #ifdef GRAAL
-    short debug_id = trap_request_debug_id(trap_request);
+    int debug_id = trap_request_debug_id(trap_request);
 #endif
     jint unloaded_class_index = trap_request_index(trap_request); // CP idx or -1
 
@@ -2038,7 +2038,7 @@
   const char* reason = trap_reason_name(trap_request_reason(trap_request));
   const char* action = trap_action_name(trap_request_action(trap_request));
 #ifdef GRAAL
-  short debug_id = trap_request_debug_id(trap_request);
+  int debug_id = trap_request_debug_id(trap_request);
 #endif
   size_t len;
   if (unloaded_class_index < 0) {
--- a/src/share/vm/runtime/deoptimization.hpp	Sun Feb 02 18:47:02 2014 +0100
+++ b/src/share/vm/runtime/deoptimization.hpp	Mon Feb 03 14:47:11 2014 +0100
@@ -294,10 +294,9 @@
       // standard action for unloaded CP entry
       return _unloaded_action;
   }
-  static short trap_request_debug_id(int trap_request) {
+  static int trap_request_debug_id(int trap_request) {
       if (trap_request < 0)
-        return (DeoptAction)
-          ((~(trap_request) >> _debug_id_shift) & right_n_bits(_debug_id_bits));
+        return ((~(trap_request) >> _debug_id_shift) & right_n_bits(_debug_id_bits));
       else
         // standard action for unloaded CP entry
         return 0;