From 7b9abae3fa877897cbc42203be358f6e05d9f12e Mon Sep 17 00:00:00 2001 From: aph Date: Thu, 7 Aug 2008 14:19:15 +0000 Subject: [PATCH] 2008-08-07 Andrew Haley * testsuite/libjava.lang/StackTrace2.java: Rewrite to prevent spurious failure when some methods are inlined. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138840 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/testsuite/libjava.lang/StackTrace2.jar | Bin 1990 -> 3165 bytes libjava/testsuite/libjava.lang/StackTrace2.java | 12 ++++++------ libjava/testsuite/libjava.lang/StackTrace2.out | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f9b879330ef..891b4dca588 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2008-08-07 Andrew Haley + + * testsuite/libjava.lang/StackTrace2.java: Rewrite to prevent + spurious failure when some methods are inlined. + 2008-08-05 Matthias Klose * 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 zcmb7G-%}G;6#i~VvdgkyhysdGgJMkrf~Hz4_!~hZsI*WlYHOFUKr}xv1dDC$PusWl ztq)FL`p_Al?M$PsGrl-|=}V{e-|2Mvo!x|N0#2vd$?n~|=bU@acfNbhog8oQ8<5|l zyV}vezl-BrADn*&=cbBQ>eh6@O4*6tWG-hH22vSoW##vOetpKT2hpp+r_j1VOoLw` zbkn+H4Q8y|;^5`En|7+G5G*dGS9%X9G*5VRhWX)GI+re70FOH9Kb)rmeY*tq`8br>xA3RY=QwdD1V7D{S>H;6_CU z8W!?-gKM;zXh(;FHlH6USSw4MiB8l9G8~%`FLs#d#7+ghn4c;Z(z!*2ZPA!V+MT6! zl^35jm{BmM@~efEJ(d=)Lmo^9L|DOeP#+P{?G+8X34%vRA>e#Rgq}ArBPtXUh&Ylr z4Lau=IXVO%FTjZR{mk2An2-48!xr9ylmWIQ#JlN?4YVT6H)4erj|Gtn##IU1s@jHQ zw~MQGdn^RkEfCDIg%f;=55c|?wqL2Y&_fHm9SiNQRM~>~*G1c+`wF#v*u`iW31<{~ zum_l|p|G)*JoTpz$iJ0>9=Phrd*30i7tfc{w!%)AZw?`a0F4eI|1SaSx$n6}7) z^qPkuW$Fmgm_oUQO{OErs4W9+=+My4{8TA5x|Xt+i|KsMWG;7bhb`L0YU~P;Xsp(L zWoM6O?5v$D4$B%lO#z#Z0&Ut!Dii8uo5hXAJaWpClo=N#&4_aT9$4nr!bz?8l&nftt!Rb$6v`XH6WyK}zLU zS)|IYrt^c741gdOY%4pg;WdShD&B5_&a9?0^L9bUVY0v}l#z^`TP!X`jzKI6XTd5{Twz(kyRM=R>La4DkSn`xg6!jnPhB6N1qO#j;%Uc z47`PD4O3*F7u`Arn0Q-aHpyzI8eX!pwt*{{)$mSjLY+!%;wr8YRQvX-l_4=VE#g-N zp?6KZCqM)oAauM>Yh$OA6OsK9du^Fr%bs^KIVX8aDeSKWz@hld^QD8BY5kGKd~qnE zgB?N*NWf_mHzgj~r5EkuQhr_n(vhLSkO*)a=dtVxRNEUV8jU68d%?tt7-*sa=^n27 zDxI$;CE+v?9UriGULMzRmm9l3lFmgIs1RYu3k5E!&|QTI?>Sa^_h%A9F?r=b~UYy&bXbd2W}?=_YEhV?xeAd5Asd=Pk_x!cbkVCTioX5 zM-#_x^9u0U%(q6it}Rp%dX@h!gloY$| zTw0n;Gp)7o+Dcm;>?g8L#I?nCw2N;oTq(jvB+bPf~LAeFkj_7J7Taq}s9XX*T_ zCB&-!yX~`$cH2EMnB^Gsa_f^AzNU4tbN(mvKSg3TeCRP=k3TEnXbHzlI2~_DgvY|? zLOoBAjQeGLG1MjFKq7o8d^yx63xh)$4T`*oI}6Ir}Iv1 z;E{qg!HrGbqECM6zKECbCefUEfM&YK(e;PeTXFOT9p#i2p65*@`EY!`PKodWg*my@ zzpl;5G(J|K|E8HPE4{^}zPB&qzxRaIfn(Nx_ zitW=?cxFfnIqNpD^tSON6~|%T58()}lQ@bC7{WA;A&ukQlE-j|v!CEBzG8v>24i?Y zAb&&>zfkfwg7*iR=sp2UC zfj6msdU6^Fb@0^y3Mq)ZgNEHGAzB|Zn z7epd^;{r%ziY9{WLkbLxu;^=kQYA(UeoAfMnoZs{O69g42ZH&3`0;s;!JBOg? z<)>f=DPvXG^)0L#C%x9GiIw5P=%#pgGx+myXUV!Z%e~4!Ce;l&)}i?^rDR2D(4y+3 z#8UEQb9=N}=(Wk;6ra2X0Ew6w-1j69C)LVG4>(a)GdwBP^m-gLW-94SrZYFn6oH+L zC5xpl>*3Tv^ccDXHVsGQnaQO&+&9aLV0?hq!|)otPW9OxImrzmJzG!gJTjMn2zb8> zySrgWC#P>JIT20?G{(dUwx*QGGN4Y5VYch;Go~T}Z~sCX(0}488TT&zboY77i`H{j z=v4#Cezz9G4;R?pQn_b zoCB^Ju_#IYhzY0p^L1T(U<78HSrw}X^N;O5yzH~zCz{n*m9UM>81NU}kZ$bz=tC;= z%6Ngxq-H(rNj8pNt%W(#Uq5T&<$Cx}+)sWgx+OAlT1d+4gj_7hXaR&^M*Fzgtc=gG zt#t9FY}fhFGQ-YvS=n5l5`>$ZR4x{`?KKc!S-s?9Sem#LQN$^R8`_y{u_1!1P~QcV zri6^hzzU|PuVQs>vCP^BrU#rQ zO^Q})o*h)JK9!}&`Oy#U@Cus{FJ(53_dGNGb3t0`jA){4=otf@bA8L`*h)9lg?67J z!>s14^uchRLijUAx2-*BuT1q3>j{Ku39UI)XW#ak8&)~?SKrwQng<(~ z9w@|`$0ODrMduXSEIi#}LxKSj^`NrI`XCiXx zm6ds(81-ZamOw39qV;%83E!CLn!m6JAml~Uvtjr)sb#}Tg*|hf480xcnK1fR8;2t^ zlh`)Z-O|$7e9yEZ_|gVx3B{ty+STY$xF`NlohJ%hU{5%Z?aD#eR;QJKWB$ScUPl(h1fkL;hpN5?y! z`L{av2Pb6O1=sjc&$ua-trw1qZ#r@lY=~s>MQ|>;v48(fYv4Oq=2$;aY(c^DhV1Z; zc*B}NEHBa4pdjs+bBSE3ZKZ`Ze?5Pkqa@@TtKu<-Mv1pL{wC|I<0r!izNj*yR^ z`CT{#CPqs%t%e{J;P4a~xe(`m!K8Z3#O(fhRN}Enno++_OPaa6n7)1;m+a9VY4{6Z zYIe{#3JdG$43&!QWZWT$wX0nfIB(*AcE+?9x>xbxl7qPt+&!%7T~CBb?Kli-8|``l zqrj+3L-hbj&!b`^qBKMW^Ai?gh{JnoBldGqE4+38Z9T?I^Xr!_lqc!(tu;bU8PufG zkX2MnQroaQL6@L{vypdy<$5~4%19pfxKg$Ec0D@JSoba4L_NMkGia`@{B4q>HWGZD z#h&~XYNH@8ASx3eY-;`{lKEl7qU8SXlGV}F=(?OCzPe9zpT~H0t`_|H9p@iX872a{ z%qPEQ)uRd$PMX=inNr@=h3j}!5tNPgOCL6eb>w6c^V?Cr;v?m$0>2rIFy(`BDl^Be z{-L!aj79VDg8~0vv=08@kR6h+qqJ{D>?=p%Q#%2^nTCi~s-t diff --git a/libjava/testsuite/libjava.lang/StackTrace2.java b/libjava/testsuite/libjava.lang/StackTrace2.java index 4a69409815e..01c7d5bac7f 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", "", 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 90cfd48d91f..dafadce812b 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.:OK +StackTrace2$Inner.foo:OK StackTrace2.a:OK StackTrace2.main:OK -- 2.11.0