From 7a4ef3104c1b2b083cc3cbb8f62ace7b97e79ac8 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@redhat.com>
Date: Thu, 7 Aug 2008 14:19:15 +0000
Subject: [PATCH] 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
---
 libjava/ChangeLog                             |   5 +++++
 .../testsuite/libjava.lang/StackTrace2.jar    | Bin 1990 -> 3165 bytes
 .../testsuite/libjava.lang/StackTrace2.java   |  12 ++++++------
 .../testsuite/libjava.lang/StackTrace2.out    |   2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f9b879330ef8..891b4dca5889 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
index edb8f0e2e743116ca28474b22300272e9b003ac8..0aacb8fa6446bac54feda21dea5d1dcfadc80707 100644
GIT binary patch
literal 3165
zc-oa#TT@e46#h;~$l-8+5CjyV28%U>2uih9z$=1AqS8XKsI5JO14MJd<Y2L_z1qID
zZ+&q3(udCYY-bv6o$;m9m%emb{!XXUZ|#I!fliajIXio=_3dw6_F8*-s?KddK2Pp@
zPyGFD2;aD%ex00~aje*#*^Cvlhx;O_l${xjC9G`r_kVtQ!PO(^^TMT}wMNVfw+7#B
z>z*}~uu{uIR~K&EF-Jqavl7qt9oEnkEz=q0!dN^NcTQ0$Sh3PSr@=j*UbGvaq0xi~
z^#<zDWWtMP4Rt{gXo<#C_La5df}NSQ7814we>5Gl5_482F8>RYZrNNzTeOBQ3Dhm6
z(+2lwH_?Gk4c^7{c*e@Ea3&b7HiWc<#U2w~*sDQz(lbsbo?6zhE7)Hqou4JTmKIJm
zFdB@R^jaonPsW9yuZ-BB2x~AEzj1N8o%LcrolqvE!K2m@AoDs#MDzK?MI6aLFLcf~
zaC8(degPvi@Dm?TVLstM7h3qNrwp(gK0Zw~HqZ*cprH-TWeBoXAJTHzRnj&TZZ~)B
zDMP3)BG8!ygj0NrZ2dqEyRTIv^b%peLg>g#6%b_9O>EJ9N$KpPwW39@QtM@4x*~;*
z^~jk&bwGZtl_^}6ybo3Kmiu$twB5|ke7>oKlmuu{3Hg5$usZkMNh_YBr-C<XQ%4ew
z?vsb#WH`8)W*KNlrxzWJPf1~7J!Y>u@pQ^$EcbAiW!ow3qahINuf*S6nn>75JLQbZ
z9(zr3Hq$b;Viz@ggF7oKmspu)Ia@cj%>H$rqUaV>x#n^5o4mC19$p;Ss?Heb!$Ao`
zaEr<ziy;#O;xswl4LF1$F9s_@Jaa$m*hv$IafDLoHK#~5o*tT}0d!)<wvuG<s)o*L
z>&~sk6N`36$1!Gs+BuN0Q_Idu;AFtSFpdkk*Q<(1S!{<fVqz3y%rR?q)lMyH=nh6|
zYe-?AQPDVM;xx|uciAy;4(GiX-%OKAgG@{aG4HBOB~m&L=(t#_dy);8OiUrl^i$a&
zIj&(MxMQ4ZS=7!%`sZ{E=y2(1)6s0;P0V^R!|dAu*~D97v&pPh)$ody<Pp4vc`x3s
z45-?~#C6=DQ|-HJRwBDi5x*`TddI}O;s}p&gpT)!HhDG@4IB#C>#LNr7gZz|Bu+66
zhqj93w(-(IpLxT9<+L*r(7{k?gJN*p#BH%hPU&UaSxGO7K{^r?7!d&;<1|+D0;TGr
zDo{k$GbXYE(8zV^9(nb(Et-gq_gOrzPU*PMgB=dUQ-LKa1ZeV7hFThWb_^-^*mT6L
zSfa9z6_0pJQ6#CXA@Sl&LM4tCsp@tWt*zL}dJCNlJU5!^W%M8a4XJw1SvD^{-#m<B
z^KzrH*m^vCH}T!T*40u_PElGwcRz<V{}jF)S|76vvk~pO9DatbCxy1x#KM}#?I2Em
z#w1QND{l)MS*zM7kjG*>+Q)Y@cM2%lZRD|^4N2NpTaow(r3Kx5j=p)4e<g?h690Vj
zYbS0;nGI&a2EEYw1m`QF%i6^s5q^&0dH>O;crElIhZ8xR%;9XPZrDHRzu@bAhDgXQ
z<IBEo8GDBPSNvCf?J};H@wCt2xWu7LT^J71z98B6)72rS`T#B<T*m35vQ0R#CgeG3
zcgV@jxs6Z`Z_t}_kI+PV9Nm131Dix|ktnAu{~{kE$(Q1MlM?<VzB#!PE~<xX)x%}#
zD;4T@^6JU&&?&E;@6pBgUB9E?nnmOuz4I7H%JF*WwoSaGjMwwyyPMc&OYWItc;vd!
z$Rg0rdr%0+_&kc^{GP@MTw;i4F@`u!@<@*19%nzsd3?zN`!y!<h>rXL5&TTa-{`zQ
zIR1++6xW9G?!yQ8Q04pvKEea#?hRr*P|2}@Pw**|$c4`or!{<Dxc~I=_l4YlG?#(x
kFY%S1ZLajyAl28X(&ty#7MH5&DUT$Px@JBUA+Zks0?favc>n+a

literal 1990
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
M@O(P#wST_;3mIlEi~s-t

diff --git a/libjava/testsuite/libjava.lang/StackTrace2.java b/libjava/testsuite/libjava.lang/StackTrace2.java
index 4a69409815ec..01c7d5bac7ff 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 90cfd48d91f1..dafadce812b5 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
-- 
2.47.3