From: Per Bothner <per@bothner.com>
Date: Sun, 21 Jan 2001 20:26:37 +0000 (-0800)
Subject: verify.c (merge_type_state): Stil may have to merge even if LABEL_VERIFIED (label).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=230cbd5f4f3408cfe60415ff3ac70d0496ec6080;p=gcc.git

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 11ad1a51507..87d02c508b6 100644
--- 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 23b30887e51..bc0bb731a8b 100644
--- 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)
 	{