diff options
| author | Andrew Haley <aph@redhat.com> | 2008-08-07 14:19:15 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2008-08-07 14:19:15 +0000 |
| commit | 7a4ef3104c1b2b083cc3cbb8f62ace7b97e79ac8 (patch) | |
| tree | f4f0541206542d71bb83caae5c937d11757726f3 /libjava | |
| parent | b53b23dcfdfeea25517fe21dcfe73ba6bb6d193e (diff) | |
| download | gcc-7a4ef3104c1b2b083cc3cbb8f62ace7b97e79ac8.zip gcc-7a4ef3104c1b2b083cc3cbb8f62ace7b97e79ac8.tar.gz gcc-7a4ef3104c1b2b083cc3cbb8f62ace7b97e79ac8.tar.bz2 | |
StackTrace2.java: Rewrite to prevent spurious failure when some methods are inlined.
2008-08-07 Andrew Haley <aph@redhat.com>
* testsuite/libjava.lang/StackTrace2.java: Rewrite to prevent
spurious failure when some methods are inlined.
From-SVN: r138840
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.lang/StackTrace2.jar | bin | 1990 -> 3165 bytes | |||
| -rw-r--r-- | libjava/testsuite/libjava.lang/StackTrace2.java | 12 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.lang/StackTrace2.out | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f9b8793..891b4dc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2008-08-07 Andrew Haley <aph@redhat.com> + + * testsuite/libjava.lang/StackTrace2.java: Rewrite to prevent + spurious failure when some methods are inlined. + 2008-08-05 Matthias Klose <doko@ubuntu.com> * HACKING: Update instructions how to build gcj/javaprims.h. diff --git a/libjava/testsuite/libjava.lang/StackTrace2.jar b/libjava/testsuite/libjava.lang/StackTrace2.jar Binary files differindex edb8f0e..0aacb8f 100644 --- a/libjava/testsuite/libjava.lang/StackTrace2.jar +++ b/libjava/testsuite/libjava.lang/StackTrace2.jar diff --git a/libjava/testsuite/libjava.lang/StackTrace2.java b/libjava/testsuite/libjava.lang/StackTrace2.java index 4a69409..01c7d5b 100644 --- a/libjava/testsuite/libjava.lang/StackTrace2.java +++ b/libjava/testsuite/libjava.lang/StackTrace2.java @@ -7,7 +7,7 @@ public class StackTrace2 { try { - a(); + new StackTrace2().a(); } catch (Exception x) { @@ -16,14 +16,14 @@ public class StackTrace2 } } - static void a() + void a() { - new Inner(); + new Inner().foo(); } - static class Inner + class Inner { - public Inner() + public void foo() { doCrash(null); } @@ -38,7 +38,7 @@ public class StackTrace2 { System.out.println("Trace length = " + trace.length); checkLine(trace[0], "StackTrace2$Inner", "doCrash", 33); - checkLine(trace[1], "StackTrace2$Inner", "<init>", 28); + checkLine(trace[1], "StackTrace2$Inner", "foo", 28); checkLine(trace[2], "StackTrace2", "a", 21); checkLine(trace[3], "StackTrace2", "main", 10); } diff --git a/libjava/testsuite/libjava.lang/StackTrace2.out b/libjava/testsuite/libjava.lang/StackTrace2.out index 90cfd48..dafadce 100644 --- a/libjava/testsuite/libjava.lang/StackTrace2.out +++ b/libjava/testsuite/libjava.lang/StackTrace2.out @@ -1,5 +1,5 @@ Trace length = 4 StackTrace2$Inner.doCrash:OK -StackTrace2$Inner.<init>:OK +StackTrace2$Inner.foo:OK StackTrace2.a:OK StackTrace2.main:OK |