ART: Remove interpreter entrypoints
These are no longer used as entrypoints. Make them proper runtime
functions local to the interpreter.
Bump oat version.
Change-Id: Icdd92e20eafc5668b68eeebf55cf624560f462b3
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc
index c37d159..78f56ee 100644
--- a/runtime/entrypoints_order_test.cc
+++ b/runtime/entrypoints_order_test.cc
@@ -114,7 +114,7 @@
sizeof(void*));
EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, last_no_thread_suspension_cause, checkpoint_functions,
sizeof(void*));
- EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, checkpoint_functions, interpreter_entrypoints,
+ EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, checkpoint_functions, jni_entrypoints,
sizeof(void*) * 6);
// Skip across the entrypoints structures.
@@ -137,15 +137,6 @@
thread_tlsptr_end);
}
- void CheckInterpreterEntryPoints() {
- CHECKED(OFFSETOF_MEMBER(InterpreterEntryPoints, pInterpreterToInterpreterBridge) == 0,
- InterpreterEntryPoints_start_with_i2i);
- EXPECT_OFFSET_DIFFNP(InterpreterEntryPoints, pInterpreterToInterpreterBridge,
- pInterpreterToCompiledCodeBridge, sizeof(void*));
- CHECKED(OFFSETOF_MEMBER(InterpreterEntryPoints, pInterpreterToCompiledCodeBridge)
- + sizeof(void*) == sizeof(InterpreterEntryPoints), InterpreterEntryPoints_all);
- }
-
void CheckJniEntryPoints() {
CHECKED(OFFSETOF_MEMBER(JniEntryPoints, pDlsymLookup) == 0,
JniEntryPoints_start_with_dlsymlookup);
@@ -321,10 +312,6 @@
CheckThreadOffsets();
}
-TEST_F(EntrypointsOrderTest, InterpreterEntryPoints) {
- CheckInterpreterEntryPoints();
-}
-
TEST_F(EntrypointsOrderTest, JniEntryPoints) {
CheckJniEntryPoints();
}