summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author Shih-wei Liao <sliao@google.com> 2012-02-28 21:24:19 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-02-28 21:24:19 -0800
commitba80a64fdb97a4c641c777d26ca3efb4c70da144 (patch)
treee91a52a859c230bc92ff432083078ef89485c47c /src
parenta15e67d5ee5aa9615596cee2be42c2b2caf128c6 (diff)
parenta61ab5edf0b32e93f0195a6590a7777b1a8b01a3 (diff)
Merge "Remove JEnv* argument from upcall stub." into dalvik-dev
Diffstat (limited to 'src')
-rw-r--r--src/compiler_llvm/upcall_compiler.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/compiler_llvm/upcall_compiler.cc b/src/compiler_llvm/upcall_compiler.cc
index 8dc4e98d05..be4c00dc2f 100644
--- a/src/compiler_llvm/upcall_compiler.cc
+++ b/src/compiler_llvm/upcall_compiler.cc
@@ -66,7 +66,6 @@ CompiledInvokeStub* UpcallCompiler::CreateStub(bool is_static,
// Get argument types
llvm::Type* arg_types[] = {
- irb_.getJEnvTy(), // JEnv*
irb_.getJObjectTy(), // Method object pointer
irb_.getJObjectTy(), // "this" object pointer (NULL for static)
irb_.getJObjectTy(), // Thread object pointer
@@ -93,7 +92,6 @@ CompiledInvokeStub* UpcallCompiler::CreateStub(bool is_static,
// Actual arguments
llvm::Function::arg_iterator arg_iter = func->arg_begin();
- arg_iter++; // jenv_addr
llvm::Value* method_object_addr = arg_iter++;
llvm::Value* callee_this_addr = arg_iter++;
llvm::Value* thread_object_addr = arg_iter++;