diff options
| author | Søren Gjesse <sgjesse@google.com> | 2017-10-27 12:47:14 +0200 |
|---|---|---|
| committer | Søren Gjesse <sgjesse@google.com> | 2017-10-27 11:06:33 +0000 |
| commit | e7caa2eaf6d67802151310e90fa069dd44206e04 (patch) | |
| tree | 979b2034105bf4824a629c15704d04834f4260fa /src/test/examples/uniquemembernames/ClsB.java | |
| parent | f0b4740f2f7296d09e8b73d841ced21a27b8e7c6 (diff) | |
| parent | 2bfb29a43eba84ad3345b17f33960dc72bb97564 (diff) | |
| download | r8-e7caa2eaf6d67802151310e90fa069dd44206e04.tar.gz | |
Update external/r8 to 2bfb29asdk-release
Merge remote-tracking branch 'aosp/upstream-mirror' into merge-r8-2bfb29a
Test: m -j USE_D8=true USE_R8=true tests
Change-Id: I249f979f3e349859607d3d67930d01e7cb82b901
Diffstat (limited to 'src/test/examples/uniquemembernames/ClsB.java')
| -rw-r--r-- | src/test/examples/uniquemembernames/ClsB.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/examples/uniquemembernames/ClsB.java b/src/test/examples/uniquemembernames/ClsB.java index 2659d5a0c..f9d4ecd4d 100644 --- a/src/test/examples/uniquemembernames/ClsB.java +++ b/src/test/examples/uniquemembernames/ClsB.java @@ -6,13 +6,13 @@ package uniquemembernames; public class ClsB extends BaseCls { @Override - protected int a() { - return foo() - a; + protected int c() { + return foo() - c; } @Override protected double bar() { - return f2 != 0 ? a / f2 : Double.MAX_VALUE; + return f2 != 0 ? c / f2 : Double.MAX_VALUE; } } |