Mercurial > hg > truffle

changeset 4691:fc42b5b6941a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some DCE in codeInstaller/exceptions.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 24 Feb 2012 20:39:12 +0100
parents b22f3f406b97
children 9d48ccb39292
files src/share/vm/graal/graalCodeInstaller.cpp src/share/vm/graal/graalJavaAccess.hpp
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Fri Feb 24 20:05:32 2012 +0100
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Fri Feb 24 20:39:12 2012 +0100
@@ -429,9 +429,7 @@
         oop exc = exception_handlers[j];
         jint handler_offset = CiTargetMethod_ExceptionHandler::handlerPos(exc);
         jint handler_bci = CiTargetMethod_ExceptionHandler::handlerBci(exc);
-        jint bci = CiTargetMethod_ExceptionHandler::bci(exc);
         jint scope_level = CiTargetMethod_ExceptionHandler::scopeLevel(exc);
-        Handle handler_type = CiTargetMethod_ExceptionHandler::exceptionType(exc);
 
         assert(handler_offset != -1, "must have been generated");
 
@@ -455,6 +453,7 @@
         }
         pcos->append(handler_offset);
 
+        // TODO: Check if we need that assert!
         // stop processing once we hit a catch any
         //        if (handler->is_catch_all()) {
         //          assert(i == handlers->length() - 1, "catch all must be last handler");
--- a/src/share/vm/graal/graalJavaAccess.hpp	Fri Feb 24 20:05:32 2012 +0100
+++ b/src/share/vm/graal/graalJavaAccess.hpp	Fri Feb 24 20:39:12 2012 +0100
@@ -144,9 +144,7 @@
   start_class(CiTargetMethod_ExceptionHandler)                                          \
     int_field(CiTargetMethod_ExceptionHandler, handlerPos)                              \
     int_field(CiTargetMethod_ExceptionHandler, handlerBci)                              \
-    int_field(CiTargetMethod_ExceptionHandler, bci)                                     \
     int_field(CiTargetMethod_ExceptionHandler, scopeLevel)                              \
-    oop_field(CiTargetMethod_ExceptionHandler, exceptionType, "Lcom/oracle/max/cri/ri/RiType;")\
   end_class                                                                             \
   start_class(CiTargetMethod_Mark)                                                      \
     oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;")                            \