diff options
| author | 2023-12-19 18:48:15 +0000 | |
|---|---|---|
| committer | 2023-12-19 20:32:27 +0000 | |
| commit | 8bc6a58df7046b4d6f4b51eb274c7e60fea396ff (patch) | |
| tree | ac6aa639279f5cf2048cb147a91cbea98c8088a4 /compiler/jni | |
| 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/jni')
| -rw-r--r-- | compiler/jni/jni_cfi_test_expected.inc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/compiler/jni/jni_cfi_test_expected.inc b/compiler/jni/jni_cfi_test_expected.inc index 47a67c72c0..3fe822666f 100644 --- a/compiler/jni/jni_cfi_test_expected.inc +++ b/compiler/jni/jni_cfi_test_expected.inc @@ -1,12 +1,9 @@ // TODO These arrays should be generated automatically or have instructions for re-creation. -// For now, the gc_is_marking offset can be adjusted by tweaking the last CL that made a -// similar change. - static constexpr uint8_t expected_asm_kThumb2[] = { 0x2D, 0xE9, 0xE0, 0x4D, 0x2D, 0xED, 0x10, 0x8A, 0x81, 0xB0, 0x00, 0x90, 0x19, 0x91, 0x8D, 0xED, 0x1A, 0x0A, 0x1B, 0x92, 0x1C, 0x93, 0x88, 0xB0, 0x08, 0xB0, 0x01, 0xB0, 0xBD, 0xEC, 0x10, 0x8A, 0xBD, 0xE8, 0xE0, 0x4D, - 0xD9, 0xF8, 0x20, 0x80, 0x70, 0x47, + 0xD9, 0xF8, 0x24, 0x80, 0x70, 0x47, }; static constexpr uint8_t expected_cfi_kThumb2[] = { 0x44, 0x0E, 0x1C, 0x85, 0x07, 0x86, 0x06, 0x87, 0x05, 0x88, 0x04, 0x8A, @@ -89,7 +86,7 @@ static constexpr uint8_t expected_cfi_kThumb2[] = { // 0x00000024: .cfi_restore: r10 // 0x00000024: .cfi_restore: r11 // 0x00000024: .cfi_restore: r14 -// 0x00000024: ldr r8, [tr, #32] ; is_gc_marking +// 0x00000024: ldr r8, [tr, #36] ; is_gc_marking // 0x00000028: bx lr // 0x0000002a: .cfi_restore_state // 0x0000002a: .cfi_def_cfa_offset: 112 @@ -104,7 +101,7 @@ static constexpr uint8_t expected_asm_kArm64[] = { 0xF3, 0x53, 0x45, 0xA9, 0xF5, 0x5B, 0x46, 0xA9, 0xF7, 0x63, 0x47, 0xA9, 0xF9, 0x6B, 0x48, 0xA9, 0xFB, 0x73, 0x49, 0xA9, 0xFD, 0x7B, 0x4A, 0xA9, 0xE8, 0x27, 0x41, 0x6D, 0xEA, 0x2F, 0x42, 0x6D, 0xEC, 0x37, 0x43, 0x6D, - 0xEE, 0x3F, 0x44, 0x6D, 0x74, 0x22, 0x40, 0xB9, 0xFF, 0xC3, 0x02, 0x91, + 0xEE, 0x3F, 0x44, 0x6D, 0x74, 0x26, 0x40, 0xB9, 0xFF, 0xC3, 0x02, 0x91, 0xC0, 0x03, 0x5F, 0xD6, }; static constexpr uint8_t expected_cfi_kArm64[] = { @@ -191,7 +188,7 @@ static constexpr uint8_t expected_cfi_kArm64[] = { // 0x0000006c: ldp d14, d15, [sp, #64] // 0x00000070: .cfi_restore_extended: r78 // 0x00000070: .cfi_restore_extended: r79 -// 0x00000070: ldr w20, [tr, #32] ; is_gc_marking +// 0x00000070: ldr w20, [tr, #48] ; is_gc_marking // 0x00000074: add sp, sp, #0xb0 (176) // 0x00000078: .cfi_def_cfa_offset: 0 // 0x00000078: ret |