From 13b835a45f3dccff1c6d024ad82a2044831c7c41 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 13 Mar 2012 19:45:22 -0700 Subject: Fix LLVM #includes and push one piece of LLVM-specific lossage down. Change-Id: I9f2b7a9fd4d543a3bd9dd9f4c62367c28c69ea36 --- src/compiler_llvm/compiler_llvm.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/compiler_llvm/compiler_llvm.cc') diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index c5e620b859..5ef171088d 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -255,7 +255,10 @@ extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler, class_loader, class_linker, dex_file, *dex_cache, NULL, method_idx, access_flags); - return compiler.GetCompilerLLVM()->CompileNativeMethod(&oat_compilation_unit); + art::CompiledMethod* result = + compiler.GetCompilerLLVM()->CompileNativeMethod(&oat_compilation_unit); + compiler.GetCompilerLLVM()->MaterializeIfThresholdReached(); + return result; } extern "C" art::CompiledInvokeStub* ArtCreateInvokeStub(art::Compiler& compiler, bool is_static, @@ -270,11 +273,6 @@ extern "C" void compilerLLVMMaterializeRemainder(art::Compiler& compiler) { compiler.GetCompilerLLVM()->MaterializeRemainder(); } -extern "C" void compilerLLVMMaterializeIfThresholdReached(art::Compiler& compiler) { - ensureCompilerLLVM(compiler); - compiler.GetCompilerLLVM()->MaterializeIfThresholdReached(); -} - // Note: Using this function carefully!!! This is temporary solution, we will remove it. extern "C" art::MutexLock* compilerLLVMMutexLock(art::Compiler& compiler) { ensureCompilerLLVM(compiler); -- cgit v1.2.3-59-g8ed1b