diff options
author | 2018-11-01 22:45:29 -0700 | |
---|---|---|
committer | 2018-11-01 22:45:47 -0700 | |
commit | bf44f151b735364434fb886d43b78ea0b47d08be (patch) | |
tree | d259e9460372ca27edda3ec1e7d2a463546bdcaa /test/624-checker-stringops/src/Main.java | |
parent | 1e152a6090c546f4a6184a5610c85cae7ac77068 (diff) |
Update 624-checker-stringops and 911-get-stack-trace.
After https://r8-review.googlesource.com/29460, D8/R8 canonicalize
const-string if possible.
Two ART tests have some constant strings, which are canonicalized by
that optimization, while outputs still expect constant loading.
For 624-checker-stringops, we can use different constants without
changing test expectations.
For 911-get-stack-trace, every `doTest()` starts with, e.g.,
System.out.println("######");
System.out.println("message");
System.out.println("######");
and one of #'s is canonicalized, hence consistenlty shifted offset in
expected outputs.
Test: art/test/testrunner/testrunner.py -b --host -t 624-checker-stringops
Test: art/test/testrunner/testrunner.py -b --host -t 911-get-stack-trace
Bug: 118235919
Change-Id: I4432fdf3e3d9cda111d0726ce930c935f2c334f0
Diffstat (limited to 'test/624-checker-stringops/src/Main.java')
-rw-r--r-- | test/624-checker-stringops/src/Main.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/624-checker-stringops/src/Main.java b/test/624-checker-stringops/src/Main.java index 3aa6e563fc..f52d81a053 100644 --- a/test/624-checker-stringops/src/Main.java +++ b/test/624-checker-stringops/src/Main.java @@ -120,7 +120,7 @@ public class Main { /// CHECK-DAG: InvokeVirtual [<<New>>] intrinsic:StringBufferLength static int bufferLen2() { StringBuffer s = new StringBuffer(); - return s.append("x").append("x").length(); + return s.append("x").append("y").length(); } static int bufferLen2Smali() throws Exception { @@ -150,7 +150,7 @@ public class Main { /// CHECK-DAG: InvokeVirtual [<<New>>] intrinsic:StringBuilderLength static int builderLen2() { StringBuilder s = new StringBuilder(); - return s.append("x").append("x").length(); + return s.append("x").append("y").length(); } static int builderLen2Smali() throws Exception { |