Fixes to verifier and slowpaths for cts invoke tests.
Instructions are never rewritten, so that has been removed from the
verifier. Also, the slowpath now checks for access errors when it
can't properly resolve a method.
Change-Id: Ie38eacec8eb092ba23502471a0b27ca8ce38fe68
diff --git a/src/class_linker.h b/src/class_linker.h
index 8a6aaec..eed9f6a 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -174,6 +174,7 @@
uint32_t method_idx,
DexCache* dex_cache,
ClassLoader* class_loader,
+ const Method* referrer,
InvokeType type)
SHARED_LOCKS_REQUIRED(GlobalSynchronization::mutator_lock_);
@@ -185,7 +186,7 @@
DexCache* dex_cache = declaring_class->GetDexCache();
ClassLoader* class_loader = declaring_class->GetClassLoader();
const DexFile& dex_file = FindDexFile(dex_cache);
- resolved_method = ResolveMethod(dex_file, method_idx, dex_cache, class_loader, type);
+ resolved_method = ResolveMethod(dex_file, method_idx, dex_cache, class_loader, referrer, type);
}
return resolved_method;
}