Refactor the temporary solution of the stubs.
Also, fix test 032 and 088.
Change-Id: I84049356b29ca6d9a5c852c926190de76b285780
diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index e5be3ba..48d4467 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -194,15 +194,13 @@
void EmitInsn_SPut(GEN_INSN_ARGS, JType field_jty);
// INVOKE instructions
- llvm::Value* EmitEnsureInitialized(llvm::Value* callee_method_object_addr,
- uint32_t method_idx,
- bool is_static,
- llvm::Value* code_addr);
+ llvm::Value* EmitFixStub(llvm::Value* callee_method_object_addr,
+ uint32_t method_idx,
+ bool is_static);
llvm::Value* EmitEnsureResolved(llvm::Value* callee,
llvm::Value* caller,
uint32_t dex_method_idx,
- Instruction::Code instr_code);
- void EmitEnsureLink(llvm::Value*);
+ bool is_virtual);
void EmitInsn_InvokeVirtual(GEN_INSN_ARGS, bool is_range);
void EmitInsn_InvokeSuper(GEN_INSN_ARGS, bool is_range);