Removed compiled resolution trampoline.
Created assembly versions of resolution trampoline for portable and
quick. Removed compiled version from the image.
Change-Id: I183e110c4e102fb45ce6e7f4e855f8bed7986251
diff --git a/src/mirror/abstract_method-inl.h b/src/mirror/abstract_method-inl.h
index fd02474..a420714 100644
--- a/src/mirror/abstract_method-inl.h
+++ b/src/mirror/abstract_method-inl.h
@@ -20,9 +20,9 @@
#include "abstract_method.h"
#include "dex_file.h"
-#include "oat/runtime/oat_support_entrypoints.h"
#include "object_array.h"
#include "runtime.h"
+#include "runtime_support.h"
namespace art {
namespace mirror {
@@ -117,8 +117,7 @@
if (GetCode() == GetInterpreterEntryPoint()) {
return;
}
- Runtime* runtime = Runtime::Current();
- if (GetCode() == runtime->GetResolutionStubArray(Runtime::kStaticMethod)->GetData()) {
+ if (GetCode() == GetResolutionTrampoline()) {
return;
}
DCHECK(IsWithinCode(pc))