[kaffe] CVS kaffe-extras (guilhem): Updated patch for KJC.

[Kaffe CVS]

PatchSet 36 
Date: 2004/05/23 12:41:34
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Updated patch for KJC.

        * kjc/JIfStatement.java
        (analyse): Removed patch. It was all wrong and the Tree-SSA optimizer
        was already excluding it.

Members: 
	patches/kjc-kaffe.diff:1.3->1.4 

Index: kaffe-extras/patches/kjc-kaffe.diff
diff -u kaffe-extras/patches/kjc-kaffe.diff:1.3 kaffe-extras/patches/kjc-kaffe.diff:1.4
--- kaffe-extras/patches/kjc-kaffe.diff:1.3	Sat May 22 17:34:48 2004
+++ kaffe-extras/patches/kjc-kaffe.diff	Sun May 23 12:41:34 2004
@@ -821,7 +821,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm;
@@ -932,7 +932,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +// Import the necessary classes
@@ -2405,7 +2405,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm;
@@ -4625,7 +4625,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm
@@ -4777,7 +4777,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +prefix Ksm
@@ -8023,7 +8023,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm;
@@ -8110,7 +8110,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm;
@@ -8302,7 +8302,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm;
@@ -8411,7 +8411,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +package at.dms.ksm;
@@ -8477,7 +8477,7 @@
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 + *
-+ * $Id: kjc-kaffe.diff,v 1.3 2004/05/22 17:34:48 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.4 2004/05/23 12:41:34 guilhem Exp $
 + */
 +
 +aaload ......... :
@@ -35350,18 +35350,6 @@
 diff -u -r1.1.1.1 -r1.3
 --- kjc/JIfStatement.java	6 Apr 2004 16:59:27 -0000	1.1.1.1
 +++ kjc/JIfStatement.java	22 May 2004 17:19:24 -0000	1.3
-@@ -85,7 +85,10 @@
-     thenClause.analyse(thenContext);
- 
-     if (elseClause == null) {
--      context.merge(thenContext);
-+      if (!cond.isConstant())
-+        context.merge(thenContext);
-+      else
-+	context.adopt(thenContext);
-     } else {
-       elseClause.analyse(context);
-       if (thenContext.isReachable() && context.isReachable()) {
 @@ -105,7 +108,6 @@
     * @param	p		the visitor
     */