commit 3fa1b7e7a7fc9785ba4e8335d730e5caf6343322
author Elliott Hughes <enh@google.com> Tue Mar 13 17:06:22 2012 -0700
committer Elliott Hughes <enh@google.com> Tue Mar 13 18:33:25 2012 -0700
tree b20075991a2f9260d043accf818f629d368baec0
parent 2f1deb5753ef39b82752fd01e7bc0fc4c15004b1

Unify the invoke stubs and replace "oat" with "Art" in the API.

Change-Id: Ic1529d7568bd5297fdce4da69ede67c2f48487a4

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 447d6f5..917c61e 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -297,7 +297,7 @@
   }
   VLOG(compiler) << "dlopen(\"" << compiler_so_name << "\", RTLD_LAZY) returned " << compiler_library_;
 
-  compiler_ = FindFunction<CompilerFn>(compiler_so_name, compiler_library_, "oatCompileMethod");
+  compiler_ = FindFunction<CompilerFn>(compiler_so_name, compiler_library_, "ArtCompileMethod");
   jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtJniCompileMethod");
   create_invoke_stub_ = FindFunction<CreateInvokeStubFn>(compiler_so_name, compiler_library_, "ArtCreateInvokeStub");
 
@@ -1160,12 +1160,7 @@
   bool is_static = (access_flags & kAccStatic) != 0;
   const CompiledInvokeStub* compiled_invoke_stub = FindInvokeStub(is_static, shorty);
   if (compiled_invoke_stub == NULL) {
-#if defined(ART_USE_LLVM_COMPILER)
     compiled_invoke_stub = (*create_invoke_stub_)(*this, is_static, shorty, shorty_len);
-#else
-    compiled_invoke_stub = (*create_invoke_stub_)(is_static, shorty, shorty_len);
-#endif
-
     CHECK(compiled_invoke_stub != NULL);
     InsertInvokeStub(is_static, shorty, compiled_invoke_stub);
   }