From 90b936ddda63139ff46a6755c3b83ad6e4ab4ac5 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 31 Jan 2017 08:58:55 -0800 Subject: ART: Refactor verify_object.h Move the actual VerifyObject check into a new cc file, as we commonly don't enable the check at all. This allows to cut the -inl include from almost all current users. This also exposes missing -inl includes. Also fix up some of our old mess where .h defined functions require -inl.h defined functions. Test: m Change-Id: I3dd821bbe2015564a29bf1ed9be00f7a7276ad61 --- compiler/optimizing/ssa_builder.cc | 2 ++ compiler/optimizing/stack_map_stream.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc index ae1e369999..487e4dd498 100644 --- a/compiler/optimizing/ssa_builder.cc +++ b/compiler/optimizing/ssa_builder.cc @@ -17,8 +17,10 @@ #include "ssa_builder.h" #include "bytecode_utils.h" +#include "mirror/class-inl.h" #include "nodes.h" #include "reference_type_propagation.h" +#include "scoped_thread_state_change-inl.h" #include "ssa_phi_elimination.h" namespace art { diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index 668108daa4..e4d480061d 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -18,8 +18,8 @@ #include +#include "art_method-inl.h" #include "base/stl_util.h" -#include "art_method.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" -- cgit v1.2.3-59-g8ed1b