From 0795f23920ee9aabf28e45c63cd592dcccf00216 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 27 Sep 2016 18:43:30 -0700 Subject: Clean up ScopedThreadStateChange to use ObjPtr Also fixed inclusion of -inl.h files in .h files by adding scoped_object_access-inl.h and scoped_fast_natvie_object_access-inl.h Changed AddLocalReference / Decode to use ObjPtr. Changed libartbenchmark to be debug to avoid linkage errors. Bug: 31113334 Test: test-art-host Change-Id: I4d2e160483a29d21e1e0e440585ed328b9811483 --- compiler/common_compiler_test.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'compiler/common_compiler_test.cc') diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 2af4d72bb2..63abfeb71e 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -33,7 +33,7 @@ #include "mirror/dex_cache.h" #include "mirror/object-inl.h" #include "oat_quick_method_header.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" #include "thread-inl.h" #include "utils.h" @@ -109,7 +109,8 @@ void CommonCompilerTest::MakeExecutable(const void* code_start, size_t code_leng FlushInstructionCache(reinterpret_cast(base), reinterpret_cast(base + len)); } -void CommonCompilerTest::MakeExecutable(mirror::ClassLoader* class_loader, const char* class_name) { +void CommonCompilerTest::MakeExecutable(ObjPtr class_loader, + const char* class_name) { std::string class_descriptor(DotToDescriptor(class_name)); Thread* self = Thread::Current(); StackHandleScope<1> hs(self); -- cgit v1.2.3-59-g8ed1b