commit c63d56637c224a281f358aec03df07f944eaf498
author David Brazdil <dbrazdil@google.com> Wed Apr 10 00:31:46 2019 +0100
committer David Brazdil <dbrazdil@google.com> Thu Apr 11 06:57:08 2019 +0000
tree 62a31ee4ec59ae5e8a73e24be1a48c9cd2a3c844
parent 0039bc553788c18ba7f619b555d744f548ae749e

Update intrinsic Unsafe.getLong() after moving to core platform API

Bug: 129062985
Bug: 130281183
Test: compiles (DCHECK in SetIntrinsic would fail otherwise)
Change-Id: If891f4be97ca4622db6f03631c6fd50536dd3ff9

runtime/hidden_api.h

diff --git a/runtime/hidden_api.h b/runtime/hidden_api.h
index 5b9c63a..e6a0ed3 100644
--- a/runtime/hidden_api.h
+++ b/runtime/hidden_api.h
@@ -290,7 +290,6 @@
       case Intrinsics::kUnsafeGetAndSetInt:
       case Intrinsics::kUnsafeGetAndSetLong:
       case Intrinsics::kUnsafeGetAndSetObject:
-      case Intrinsics::kUnsafeGetLong:
       case Intrinsics::kUnsafeGetLongVolatile:
       case Intrinsics::kUnsafeGetObject:
       case Intrinsics::kUnsafeGetObjectVolatile:
@@ -356,6 +355,8 @@
       case Intrinsics::kVarHandleWeakCompareAndSetPlain:
       case Intrinsics::kVarHandleWeakCompareAndSetRelease:
         return 0u;
+      case Intrinsics::kUnsafeGetLong:
+        return kAccCorePlatformApi;
       default:
         // Remaining intrinsics are public API. We DCHECK that in SetIntrinsic().
         return kAccPublicApi;