diff options
| -rw-r--r-- | runtime/hidden_api.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/runtime/hidden_api.h b/runtime/hidden_api.h index c6f08653d7..58844b3fb1 100644 --- a/runtime/hidden_api.h +++ b/runtime/hidden_api.h @@ -282,24 +282,31 @@ ALWAYS_INLINE inline uint32_t GetRuntimeFlags(ArtMethod* method) case Intrinsics::kReferenceGetReferent: case Intrinsics::kMemoryPeekByte: case Intrinsics::kMemoryPokeByte: + case Intrinsics::kCRC32Update: + case Intrinsics::kCRC32UpdateBytes: + case Intrinsics::kCRC32UpdateByteBuffer: + case Intrinsics::kStringNewStringFromBytes: + case Intrinsics::kStringNewStringFromChars: + case Intrinsics::kStringNewStringFromString: + case Intrinsics::kMemoryPeekIntNative: + case Intrinsics::kMemoryPeekLongNative: + case Intrinsics::kMemoryPeekShortNative: + case Intrinsics::kMemoryPokeIntNative: + case Intrinsics::kMemoryPokeLongNative: + case Intrinsics::kMemoryPokeShortNative: case Intrinsics::kUnsafeCASInt: case Intrinsics::kUnsafeCASLong: case Intrinsics::kUnsafeCASObject: - case Intrinsics::kUnsafeGet: case Intrinsics::kUnsafeGetAndAddInt: case Intrinsics::kUnsafeGetAndAddLong: case Intrinsics::kUnsafeGetAndSetInt: case Intrinsics::kUnsafeGetAndSetLong: case Intrinsics::kUnsafeGetAndSetObject: case Intrinsics::kUnsafeGetLongVolatile: - case Intrinsics::kUnsafeGetObject: case Intrinsics::kUnsafeGetObjectVolatile: case Intrinsics::kUnsafeGetVolatile: - case Intrinsics::kUnsafePut: - case Intrinsics::kUnsafePutLong: case Intrinsics::kUnsafePutLongOrdered: case Intrinsics::kUnsafePutLongVolatile: - case Intrinsics::kUnsafePutObject: case Intrinsics::kUnsafePutObjectOrdered: case Intrinsics::kUnsafePutObjectVolatile: case Intrinsics::kUnsafePutOrdered: @@ -307,18 +314,6 @@ ALWAYS_INLINE inline uint32_t GetRuntimeFlags(ArtMethod* method) case Intrinsics::kUnsafeLoadFence: case Intrinsics::kUnsafeStoreFence: case Intrinsics::kUnsafeFullFence: - case Intrinsics::kCRC32Update: - case Intrinsics::kCRC32UpdateBytes: - case Intrinsics::kCRC32UpdateByteBuffer: - case Intrinsics::kStringNewStringFromBytes: - case Intrinsics::kStringNewStringFromChars: - case Intrinsics::kStringNewStringFromString: - case Intrinsics::kMemoryPeekIntNative: - case Intrinsics::kMemoryPeekLongNative: - case Intrinsics::kMemoryPeekShortNative: - case Intrinsics::kMemoryPokeIntNative: - case Intrinsics::kMemoryPokeLongNative: - case Intrinsics::kMemoryPokeShortNative: case Intrinsics::kVarHandleFullFence: case Intrinsics::kVarHandleAcquireFence: case Intrinsics::kVarHandleReleaseFence: @@ -356,7 +351,6 @@ ALWAYS_INLINE inline uint32_t GetRuntimeFlags(ArtMethod* method) case Intrinsics::kVarHandleWeakCompareAndSetPlain: case Intrinsics::kVarHandleWeakCompareAndSetRelease: return 0u; - case Intrinsics::kUnsafeGetLong: case Intrinsics::kFP16Ceil: case Intrinsics::kFP16Floor: case Intrinsics::kFP16Greater: @@ -366,6 +360,12 @@ ALWAYS_INLINE inline uint32_t GetRuntimeFlags(ArtMethod* method) case Intrinsics::kFP16ToFloat: case Intrinsics::kFP16ToHalf: case Intrinsics::kFP16Rint: + case Intrinsics::kUnsafeGet: + case Intrinsics::kUnsafeGetLong: + case Intrinsics::kUnsafeGetObject: + case Intrinsics::kUnsafePutLong: + case Intrinsics::kUnsafePut: + case Intrinsics::kUnsafePutObject: return kAccCorePlatformApi; default: // Remaining intrinsics are public API. We DCHECK that in SetIntrinsic(). |