Fix branch destination in nterp_instance_of_slow_path.
We were wrongly jumping to the read barrier call. While this
doesn't have side effects on CC (besides performance),
it will break with userfaultfd GC.
Test: m
Change-Id: Ibb653c5188c44a21ec0280b2b826978db5a91ddb
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:
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