patch: java verifier bug when merging types

Sun Jan 21 12:26:00 GMT 2001

This bug causes the verifier to replace rather than merge the
type state at a label if the label had been verified previously.
That caused spurious verification errors.
I checked this in.
2001年01月21日 Per Bothner <per@bothner.com>
	* verify.c (merge_type_state): Stil may have to merge even if
	LABEL_VERIFIED (label).
Index: verify.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/verify.c,v
retrieving revision 1.35
diff -u -p -r1.35 verify.c

--- verify.c	2001年01月14日 21:48:10	1.35
+++ verify.c	2001年01月21日 19:12:29
@@ -232,7 +232,7 @@ merge_type_state (label)
 int cur_length = stack_pointer + nlocals;
 tree vec = LABEL_TYPE_STATE (label);
 tree return_map;
- if (vec == NULL_TREE || !LABEL_VERIFIED (label))
+ if (vec == NULL_TREE)
 {
 if (!vec)
 	{
-- 
	--Per Bothner
per@bothner.com http://www.bothner.com/~per/
