commit 4cb788f31f6082d983891d17f7cfc0e7d49fb858
author Nicolas Geoffray <ngeoffray@google.com> Fri May 27 08:03:08 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 27 08:03:08 2022 +0000
tree 4483a11d427d82c522e422460b60eebc9085684a
parent bc0c56901906d4efe90c060a8fb4b9e844114479
parent e96d1e9bd5e311cdc5db326bcf57e5c6cedc9e52

Fix branch destination in nterp_instance_of_slow_path. am: e96d1e9bd5

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/18494498

Change-Id: I6e1599d3e29f71fe313f54e1fb68143b7d272c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

runtime/interpreter/mterp/arm64ng/object.S

diff --git a/runtime/interpreter/mterp/arm64ng/object.S b/runtime/interpreter/mterp/arm64ng/object.S
index a2d4497..df044d9 100644
--- a/runtime/interpreter/mterp/arm64ng/object.S
+++ b/runtime/interpreter/mterp/arm64ng/object.S
@@ -99,7 +99,7 @@
    // not going to slow path if the super class hierarchy check fails.
    TEST_IF_MARKING 4f
    ldr     w3, [x1, #MIRROR_CLASS_ACCESS_FLAGS_OFFSET]
-   tbnz    w3, #MIRROR_CLASS_IS_INTERFACE_FLAG_BIT, 4f
+   tbnz    w3, #MIRROR_CLASS_IS_INTERFACE_FLAG_BIT, 5f
    ldr     w3, [x1, #MIRROR_CLASS_COMPONENT_TYPE_OFFSET]
    cbnz    w3, 3f
 1:

runtime/interpreter/mterp/armng/object.S

diff --git a/runtime/interpreter/mterp/armng/object.S b/runtime/interpreter/mterp/armng/object.S
index 8a393ce..7deffaf 100644
--- a/runtime/interpreter/mterp/armng/object.S
+++ b/runtime/interpreter/mterp/armng/object.S
@@ -101,7 +101,7 @@
    TEST_IF_MARKING 4f
    ldr     r3, [r1, #MIRROR_CLASS_ACCESS_FLAGS_OFFSET]
    tst     r3, #MIRROR_CLASS_IS_INTERFACE_FLAG
-   bne     4f
+   bne     5f
    ldr     r3, [r1, #MIRROR_CLASS_COMPONENT_TYPE_OFFSET]
    cmp     r3, #0
    bne     3f