This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[RFA] Fix getlocalvartable tests
- From: Keith Seitz <keiths at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: Tue, 10 Jul 2007 11:53:59 -0700
- Subject: [RFA] Fix getlocalvartable tests
Hi,
The attached patch should fix the failing JVMTI getlocalvartable tests.
Due to a recent change to fixup variable tables when DIRECT_THREADED, we
now must make sure that methods are compiled before querying the
variable table.
QCC?
Keith
ChangeLog
2007-07-10 Keith Seitz <keiths@redhat.com>
* interpret.cc (get_local_var_table) [DIRECT_THREADED]: Make
sure the
method is compiled.
* testsuite/libjava.jvmti/interp/getlocalvartable.out: Revise
for compiled methods.
Index: interpret.cc
===================================================================
--- interpret.cc (revision 126494)
+++ interpret.cc (working copy)
@@ -1534,7 +1534,11 @@
char **generic_sig, jlong *startloc,
jint *length, jint *slot,
int table_slot)
-{
+{
+#ifdef DIRECT_THREADED
+ _Jv_CompileMethod (this);
+#endif
+
if (local_var_table == NULL)
return -2;
if (table_slot >= local_var_table_len)
Index: testsuite/libjava.jvmti/interp/getlocalvartable.out
===================================================================
--- testsuite/libjava.jvmti/interp/getlocalvartable.out (revision 126494)
+++ testsuite/libjava.jvmti/interp/getlocalvartable.out (working copy)
@@ -4,106 +4,106 @@
Sig: Lgetlocalvartable;
Gen Sig: Lgetlocalvartable;
Start Loc: 0
- Length: 28
+ Length: 29
Slot: 1
Name: pone
Sig: F
Gen Sig: F
Start Loc: 0
- Length: 28
+ Length: 29
Slot: 2
Name: ptwo
Sig: F
Gen Sig: F
Start Loc: 0
- Length: 28
+ Length: 29
Slot: 3
Name: fone
Sig: F
Gen Sig: F
Start Loc: 2
- Length: 26
+ Length: 27
Slot: 4
Name: ftwo
Sig: F
Gen Sig: F
Start Loc: 7
- Length: 21
+ Length: 22
Slot: 5
Name: done
Sig: D
Gen Sig: D
Start Loc: 14
- Length: 14
+ Length: 15
Slot: 7
Name: dtwo
Sig: D
Gen Sig: D
Start Loc: 22
- Length: 6
+ Length: 7
Slot: 0
Name: this
Sig: Lgetlocalvartable;
Gen Sig: Lgetlocalvartable;
Start Loc: 0
- Length: 25
+ Length: 26
Slot: 1
Name: ipone
Sig: I
Gen Sig: I
Start Loc: 0
- Length: 25
+ Length: 26
Slot: 2
Name: iptwo
Sig: I
Gen Sig: I
Start Loc: 0
- Length: 25
+ Length: 26
Slot: 3
Name: ione
Sig: I
Gen Sig: I
Start Loc: 2
- Length: 23
+ Length: 24
Slot: 4
Name: itwo
Sig: I
Gen Sig: I
Start Loc: 7
- Length: 18
+ Length: 19
Slot: 5
Name: lone
Sig: J
Gen Sig: J
Start Loc: 11
- Length: 14
+ Length: 15
Slot: 7
Name: ltwo
Sig: J
Gen Sig: J
Start Loc: 19
- Length: 6
+ Length: 7
Slot: 0
Name: this
Sig: Lgetlocalvartable;
Gen Sig: Lgetlocalvartable;
Start Loc: 0
- Length: 8
+ Length: 9
Slot: 1
Name: op
Sig: Ljava/lang/Object;
Gen Sig: Ljava/lang/Object;
Start Loc: 0
- Length: 8
+ Length: 9
Slot: 2
Name: oone
Sig: Ljava/lang/Object;
Gen Sig: Ljava/lang/Object;
Start Loc: 2
- Length: 6
+ Length: 7
Slot: 3
Name: otwo
Sig: Ljava/lang/Object;
Gen Sig: Ljava/lang/Object;
Start Loc: 4
- Length: 4
+ Length: 5