This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: N19990310_4 regression patch
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Subject: Patch: N19990310_4 regression patch
- From: Tom Tromey <tromey at redhat dot com>
- Date: 12 Jul 2001 11:26:40 -0600
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Reply-To: tromey at redhat dot com
Alex gave me permission off-list to check this in. This is an old
patch of mine which fixes the N19990310_4.java test suite failure.
I'm checking in this patch and I'm removing the xfail file.
2001-07-12 Tom Tromey <tromey@redhat.com>
* expr.c (expand_load_internal): New function.
(LOAD_INTERNAL): Use it.
2001-07-12 Tom Tromey <tromey@redhat.com>
* libjava.lang/N19990310_4.xfail: Removed.
Tom
Index: expr.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/expr.c,v
retrieving revision 1.102.2.1
diff -u -r1.102.2.1 expr.c
--- expr.c 2001/02/16 22:32:24 1.102.2.1
+++ expr.c 2001/04/11 20:11:02
@@ -57,6 +57,7 @@
static tree build_java_monitor PARAMS ((tree, tree));
static void expand_java_pushc PARAMS ((int, tree));
static void expand_java_return PARAMS ((tree));
+static void expand_load_internal PARAMS ((int, tree, int));
static void expand_java_NEW PARAMS ((tree));
static void expand_java_INSTANCEOF PARAMS ((tree));
static void expand_java_CHECKCAST PARAMS ((tree));
@@ -1083,6 +1084,32 @@
}
}
+static void
+expand_load_internal (index, type, pc)
+ int index;
+ tree type;
+ int pc;
+{
+ tree copy;
+ tree var = find_local_variable (index, type, pc);
+
+ /* Now VAR is the VAR_DECL (or PARM_DECL) that we are going to push
+ on the stack. If there is an assignment to this VAR_DECL between
+ the stack push and the use, then the wrong code could be
+ generated. To avoid this we create a new local and copy our
+ value into it. Then we push this new local on the stack.
+ Hopefully this all gets optimized out. */
+ copy = build_decl (VAR_DECL, NULL_TREE, type);
+ DECL_CONTEXT (copy) = current_function_decl;
+ layout_decl (copy, 0);
+ DECL_REGISTER (copy) = 1;
+ expand_decl (copy);
+ MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (copy);
+ DECL_INITIAL (copy) = var;
+ expand_decl_init (copy);
+ push_value (copy);
+}
+
tree
build_address_of (value)
tree value;
@@ -2844,7 +2871,7 @@
/* internal macro added for use by the WIDE case */
#define LOAD_INTERNAL(OPTYPE, OPVALUE) \
- push_value (find_local_variable (OPVALUE, type_map[OPVALUE], oldpc));
+ expand_load_internal (OPVALUE, type_map[OPVALUE], oldpc);
/* Push local variable onto the opcode stack. */
#define LOAD(OPERAND_TYPE, OPERAND_VALUE) \