This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[gcjx] Patch: FYI: fix earlier snafu


I'm checking this in on the gcjx branch.

I didn't rebuild the class library with my earlier bug fix, or I would
have noticed that it didn't work.  It crashed while processing
cleanups when one of the new dummy entries was on the stack.  With
this patch we skip these entries.  The result builds classpath cvs
again.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* bytecode/generate.cc (emit_saved_cleanup): Handle case where
	handler variable is -2.

Index: bytecode/generate.cc
===================================================================
RCS file: /cvs/gcc/gcc/gcjx/bytecode/Attic/generate.cc,v
retrieving revision 1.1.2.21
diff -u -r1.1.2.21 generate.cc
--- bytecode/generate.cc 14 Sep 2005 03:55:23 -0000 1.1.2.21
+++ bytecode/generate.cc 14 Sep 2005 05:29:58 -0000
@@ -349,7 +349,7 @@
   // blocks.
   if (handler.block)
     handler.block->visit (this);
-  else if (handler.variable != -1)
+  else if (handler.variable >= 0)
     {
       // 'NULL' represents the handler for a synchronized block.
       model_class *obj = global->get_compiler ()->java_lang_Object ();


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]