Convert CompilerTest over to use Compiler
Change-Id: Ie9ec6a021126f68acd3f6d35ebe73247b5cc360f
diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 8485ced..1746cc3 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -21,8 +21,6 @@
#include "stringpiece.h"
#include "thread.h"
-extern bool oatCompileMethod(art::Method*, art::InstructionSet);
-
namespace art {
// This is private API, but with two different implementations: ARM and x86.
@@ -264,10 +262,6 @@
const Method::InvokeStub* stub = method->GetInvokeStub();
CHECK(stub != NULL);
- // Compile...
- // TODO: not here!
- oatCompileMethod(method, kThumb2);
-
JValue result;
if (method->HasCode()) {
(*stub)(method, receiver, self, args, &result);
@@ -686,7 +680,7 @@
ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
std::string descriptor(NormalizeJniClassDescriptor(name));
// TODO: need to get the appropriate ClassLoader.
- ClassLoader* cl = ts.Self()->GetClassLoaderOverride();
+ const ClassLoader* cl = ts.Self()->GetClassLoaderOverride();
Class* c = class_linker->FindClass(descriptor, cl);
return AddLocalReference<jclass>(ts, c);
}
@@ -2826,7 +2820,7 @@
// the comments in the JNI FindClass function.)
typedef int (*JNI_OnLoadFn)(JavaVM*, void*);
JNI_OnLoadFn jni_on_load = reinterpret_cast<JNI_OnLoadFn>(sym);
- ClassLoader* old_class_loader = self->GetClassLoaderOverride();
+ const ClassLoader* old_class_loader = self->GetClassLoaderOverride();
self->SetClassLoaderOverride(class_loader);
old_state = self->GetState();