diff options
| author | 2023-12-19 18:48:15 +0000 | |
|---|---|---|
| committer | 2023-12-19 20:32:27 +0000 | |
| commit | 8bc6a58df7046b4d6f4b51eb274c7e60fea396ff (patch) | |
| tree | ac6aa639279f5cf2048cb147a91cbea98c8088a4 /compiler/utils | |
| parent | ee7471ec0a7aba338c3ac90de0f2ef0be9a35fed (diff) | |
Revert^17 "Thread suspension cleanup and deadlock fix"
This reverts commit c6371b52df0da31acc174a3526274417b7aac0a7.
Reason for revert: This seems to have two remaining issues:
1. The second DCHECK in WaitForFlipFunction is not completely guaranteed to hold, resulting in failures for 658-fp-read-barrier.
2. WaitForSuspendBarrier seems to time out occasionally, possibly spuriously so. We fail when the futex times out once. That's probably incompatible with the app freezer. We should retry a few times.
Change-Id: Ibd8909b31083fc29e6d4f1fcde003d08eb16fc0a
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/assembler_thumb_test_expected.cc.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/utils/assembler_thumb_test_expected.cc.inc b/compiler/utils/assembler_thumb_test_expected.cc.inc index 6e0048eb20..aea7f14762 100644 --- a/compiler/utils/assembler_thumb_test_expected.cc.inc +++ b/compiler/utils/assembler_thumb_test_expected.cc.inc @@ -76,7 +76,7 @@ const char* const VixlJniHelpersResults = { " e4: f1bb 0f00 cmp.w r11, #0\n" " e8: bf18 it ne\n" " ea: 46e3 movne r11, r12\n" - " ec: f8d9 c094 ldr.w r12, [r9, #148]\n" + " ec: f8d9 c09c ldr.w r12, [r9, #156]\n" " f0: f1bc 0f00 cmp.w r12, #0\n" " f4: d16f bne 0x1d6 @ imm = #222\n" " f6: f8cd c7ff str.w r12, [sp, #2047]\n" @@ -151,10 +151,10 @@ const char* const VixlJniHelpersResults = { " 206: b001 add sp, #4\n" " 208: ecbd 8a10 vpop {s16, s17, s18, s19, s20, s21, s22, s23, s24, s25, s26, s27, s28, s29, s30, s31}\n" " 20c: e8bd 4de0 pop.w {r5, r6, r7, r8, r10, r11, lr}\n" - " 210: f8d9 8020 ldr.w r8, [r9, #32]\n" + " 210: f8d9 8024 ldr.w r8, [r9, #36]\n" " 214: 4770 bx lr\n" - " 216: f8d9 0094 ldr.w r0, [r9, #148]\n" - " 21a: f8d9 e2c4 ldr.w lr, [r9, #708]\n" + " 216: f8d9 009c ldr.w r0, [r9, #156]\n" + " 21a: f8d9 e2d0 ldr.w lr, [r9, #720]\n" " 21e: 47f0 blx lr\n" }; |