Fix bit rot in non-direct-threaded builds

Andrew Haley aph@redhat.com
Tue Jul 12 12:55:00 GMT 2011


Non-direct-threaded code doesn't work.  It must have rotted a
log time ago.  Maybe we should remove options that never get
built.

Andrew.


2011-07-12  Andrew Haley  <aph@redhat.com>

        * interpret.cc (check_handler): Fix bit rot.
        (breakpoint_at): Likewise.

Index: interpret.cc
===================================================================
--- interpret.cc        (revision 176198)
+++ interpret.cc        (working copy)
@@ -1474,7 +1474,7 @@
               if (exc[i].handler_type.i != 0)
                     handler
                       = (_Jv_Linker::resolve_pool_entry (meth->defining_class,
-                                                                             ex$
+                                            exc[i].handler_type.i)).clazz;
 #endif /* DIRECT_THREADED */
               if (handler == NULL || handler->isAssignableFrom (exc_class))
                 {
@@ -1626,7 +1626,7 @@
       return (insn->insn == breakpoint_insn->insn);
 #else
       pc_t code = reinterpret_cast<pc_t> (bytecode ());
-      return (code[index] == breakpoint_insn);
+      return (code[index] == bp_insn_opcode);
 #endif
     }



More information about the Java-patches mailing list