summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2024-10-17 08:47:00 +0000
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-17 10:22:53 +0000
commitd96190b790e4cde51e992d7613e6df1af63a9b35 (patch)
tree1eae0a473e4d980e14dbd9f956cb9927799bb653
parentd5a09b3adf930729ccb17c1e466c9c5eb053082a (diff)
Revert "IsMemorySharedMethod fix for intrinsics"
This reverts commit 54c1c76edb6e8cb92788559f9d10a8241e643a15. Bug: 78151261 Bug: 162110941 Bug: 373966864 Reason for revert: b/373966864 Change-Id: I49a22a3f0b687cc016614cad18e72bfb4f7a4a97
-rw-r--r--runtime/art_method.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/runtime/art_method.h b/runtime/art_method.h
index 51520ddd4c..30dc09f67f 100644
--- a/runtime/art_method.h
+++ b/runtime/art_method.h
@@ -356,14 +356,6 @@ class EXPORT ArtMethod final {
}
static bool IsMemorySharedMethod(uint32_t access_flags) {
- // There's an overlap with `kAccMemorySharedMethod` and `kAccIntrinsicBits` but that's OK as
- // intrinsics are always in the boot image and therefore memory shared.
- static_assert((kAccMemorySharedMethod & kAccIntrinsicBits) != 0,
- "kAccMemorySharedMethod deliberately overlaps intrinsic bits");
- if (IsIntrinsic(access_flags)) {
- return true;
- }
-
return (access_flags & kAccMemorySharedMethod) != 0;
}