diff options
| author | Roland Levillain <rpl@google.com> | 2023-06-19 16:06:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-19 16:06:49 +0000 |
| commit | 739c60f891e991f85069d0d38c4035a9e7dfa9b8 (patch) | |
| tree | 21aec8cee3fbeeb98505fdf293d7bbd4b3b8893d | |
| parent | adf3ab287bc0cb6698eaecb1413839040c77b2df (diff) | |
| parent | 87837ed32611853377fa43e229834c647d6557e1 (diff) | |
| download | art-739c60f891e991f85069d0d38c4035a9e7dfa9b8.tar.gz | |
Disable some Checker assertions in `1004-checker-volatile-ref-load`. am: 87837ed326
Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/23745544
Change-Id: Ieeee65d319c294c620be751df67665700c27b77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | test/1004-checker-volatile-ref-load/src/Main.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/test/1004-checker-volatile-ref-load/src/Main.java b/test/1004-checker-volatile-ref-load/src/Main.java index 9542f363a4..6455e3ec3f 100644 --- a/test/1004-checker-volatile-ref-load/src/Main.java +++ b/test/1004-checker-volatile-ref-load/src/Main.java @@ -36,16 +36,23 @@ public class Main { /// CHECK: <<Foo:l\d+>> InstanceFieldGet [{{l\d+}}] field_name:Main.foo field_type:Reference loop:<<Loop:B\d+>> /// CHECK: NullCheck [<<Foo>>] dex_pc:<<PC:\d+>> loop:<<Loop>> /// CHECK-NEXT: InstanceFieldGet [<<Foo>>] dex_pc:<<PC>> field_name:Foo.bar field_type:Reference loop:<<Loop>> - /// CHECK-NEXT: add w<<BaseRegNum:\d+>>, {{w\d+}}, #0x8 (8) - /// CHECK-NEXT: adr lr, #+0x{{c|10}} + /* The following following Checker assertions are only valid when the compiler is emitting Baker + read barriers, i.e. when ART is using the Concurrent Copying (CC) garbage collector. + + TODO(b/283392413, b/283780888): Re-enable the following Checker assertions (by replacing the + double forward slash comments with triple forward slash ones) when b/283780888 is resolved. + + // CHECK-NEXT: add w<<BaseRegNum:\d+>>, {{w\d+}}, #0x8 (8) + // CHECK-NEXT: adr lr, #+0x{{c|10}} // The following instruction (generated by // `art::arm64::CodeGeneratorARM64::EmitBakerReadBarrierCbnz`) checks the // Marking Register (X20) and goes into the Baker read barrier thunk if MR is // not null. The null offset (#+0x0) in the CBNZ instruction is a placeholder // for the offset to the Baker read barrier thunk (which is not yet set when // the CFG output is emitted). - /// CHECK-NEXT: cbnz x20, #+0x0 - /// CHECK-NEXT: ldar {{w\d+}}, [x<<BaseRegNum>>] + // CHECK-NEXT: cbnz x20, #+0x0 + // CHECK-NEXT: ldar {{w\d+}}, [x<<BaseRegNum>>] + */ public void test() { // Continually check that reading field `foo.bar` throws a |