From 74180cad94848107cf297d37e72437c5a6eecf1b Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Wed, 27 Mar 2013 15:29:11 -0700 Subject: Remove code related to compiled invoke stubs. Note that the oat file version is now bumped to 004. A clean-oat will be necessary after syncing this change. Change-Id: If8875335b7fcc39b6b40c6f95de07da50da7b6b8 --- src/compiler/driver/compiler_driver.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/compiler/driver/compiler_driver.h') diff --git a/src/compiler/driver/compiler_driver.h b/src/compiler/driver/compiler_driver.h index c87d6f7a1a..f398e31265 100644 --- a/src/compiler/driver/compiler_driver.h +++ b/src/compiler/driver/compiler_driver.h @@ -122,10 +122,6 @@ class CompilerDriver { CompiledMethod* GetCompiledMethod(MethodReference ref) const LOCKS_EXCLUDED(compiled_methods_lock_); - CompiledInvokeStub* FindInvokeStub(bool is_static, const char* shorty) const; - CompiledInvokeStub* FindInvokeStub(const std::string& key) const - LOCKS_EXCLUDED(compiled_invoke_stubs_lock_); - CompiledInvokeStub* FindProxyStub(const char* shorty) const; void AddRequiresConstructorBarrier(Thread* self, const DexFile* dex_file, size_t class_def_index); @@ -321,9 +317,6 @@ class CompilerDriver { static void CompileClass(const ParallelCompilationManager* context, size_t class_def_index) LOCKS_EXCLUDED(Locks::mutator_lock_); - void InsertInvokeStub(const std::string& key, CompiledInvokeStub* compiled_invoke_stub) - LOCKS_EXCLUDED(compiled_invoke_stubs_lock_); - void InsertProxyStub(const char* shorty, CompiledInvokeStub* compiled_proxy_stub); std::vector code_to_patch_; @@ -348,10 +341,6 @@ class CompilerDriver { MethodTable compiled_methods_ GUARDED_BY(compiled_methods_lock_); typedef SafeMap InvokeStubTable; - // Invocation stubs created to allow invocation of the compiled methods. - mutable Mutex compiled_invoke_stubs_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; - InvokeStubTable compiled_invoke_stubs_ GUARDED_BY(compiled_invoke_stubs_lock_); - typedef SafeMap ProxyStubTable; // Proxy stubs created for proxy invocation delegation mutable Mutex compiled_proxy_stubs_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; @@ -387,9 +376,6 @@ class CompilerDriver { uint32_t access_flags, uint32_t method_idx, const DexFile& dex_file); JniCompilerFn jni_compiler_; - typedef CompiledInvokeStub* (*CreateInvokeStubFn)(CompilerDriver& driver, bool is_static, - const char* shorty, uint32_t shorty_len); - CreateInvokeStubFn create_invoke_stub_; pthread_key_t tls_key_; @@ -404,11 +390,6 @@ class CompilerDriver { (const CompilerDriver& driver, const CompiledMethod* cm, const mirror::AbstractMethod* method); CompilerGetMethodCodeAddrFn compiler_get_method_code_addr_; - typedef const mirror::AbstractMethod::InvokeStub* (*CompilerGetMethodInvokeStubAddrFn) - (const CompilerDriver& driver, const CompiledInvokeStub* cm, const mirror::AbstractMethod* method); - CompilerGetMethodInvokeStubAddrFn compiler_get_method_invoke_stub_addr_; - - DISALLOW_COPY_AND_ASSIGN(CompilerDriver); }; -- cgit v1.2.3-59-g8ed1b