verify.c (merge_type_state): Stil may have to merge even if LABEL_VERIFIED (label).

	* verify.c (merge_type_state):  Stil may have to merge even if
	LABEL_VERIFIED (label).

From-SVN: r39170

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 11ad1a5150787e7d7269c7aeca384c0cc7d632c5..87d02c508b69d288c169a4be9fe73aa04c9bd5a3 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-21  Per Bothner  <per@bothner.com>
+
+       * verify.c (merge_type_state):  Stil may have to merge even if
+       LABEL_VERIFIED (label).
+
 2001-01-21  Per Bothner  <per@bothner.com>
 
        * parse.y (method_header):  Don't set the DECL_NAME of a FUNCTION_DECL

diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index 23b30887e514c78eb8ab182f36a3f748f7779cce..bc0bb731a8b953c97a0292b6042d847de31e1bd5 100644 (file)
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -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)
        {