diff options
| author | 2023-12-19 18:48:15 +0000 | |
|---|---|---|
| committer | 2023-12-19 20:32:27 +0000 | |
| commit | 8bc6a58df7046b4d6f4b51eb274c7e60fea396ff (patch) | |
| tree | ac6aa639279f5cf2048cb147a91cbea98c8088a4 /runtime/oat.h | |
| 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 'runtime/oat.h')
| -rw-r--r-- | runtime/oat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index 48b7c5f3df..81ee6e4d7c 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -44,8 +44,8 @@ std::ostream& operator<<(std::ostream& stream, StubType stub_type); class PACKED(4) OatHeader { public: static constexpr std::array<uint8_t, 4> kOatMagic { { 'o', 'a', 't', '\n' } }; - // Last oat version changed reason: Change suspend barrier data structure. - static constexpr std::array<uint8_t, 4> kOatVersion{{'2', '4', '0', '\0'}}; + // Last oat version changed reason: Refactor OatQuickMethodHeader for assembly stubs. + static constexpr std::array<uint8_t, 4> kOatVersion{{'2', '3', '9', '\0'}}; static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; static constexpr const char* kDebuggableKey = "debuggable"; |