* interpret.cc (get_local_var_table) [DIRECT_THREADED]: Make sure the

        method is compiled.
        * testsuite/libjava.jvmti/interp/getlocalvartable.out: Revise
        for compiled methods.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126556 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d7aec56..1f76f67 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-11  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.
+
 2007-07-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        PR libgcj/32651

diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 01a9c38..092f3dd 100644 (file)
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -1534,7 +1534,11 @@ _Jv_InterpMethod::get_local_var_table (char **name, char **sig,
                                        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)

diff --git a/libjava/testsuite/libjava.jvmti/interp/getlocalvartable.out b/libjava/testsuite/libjava.jvmti/interp/getlocalvartable.out
index 2e0ec40..46c5513 100644 (file)
--- a/libjava/testsuite/libjava.jvmti/interp/getlocalvartable.out
+++ b/libjava/testsuite/libjava.jvmti/interp/getlocalvartable.out
@@ -4,106 +4,106 @@ Slot: 0
   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