diff options
23 files changed, 31 insertions, 25 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index dcbf9ebf52..fa0a02f997 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -35,7 +35,7 @@ #include "thread-inl.h" #include "unstarted_runtime.h" -namespace art { +namespace art HIDDEN { namespace interpreter { ALWAYS_INLINE static ObjPtr<mirror::Object> ObjArg(uint32_t arg) diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h index f7bc1a3d55..c7508f66f9 100644 --- a/runtime/interpreter/interpreter.h +++ b/runtime/interpreter/interpreter.h @@ -18,10 +18,11 @@ #define ART_RUNTIME_INTERPRETER_INTERPRETER_H_ #include "base/locks.h" +#include "base/macros.h" #include "dex/dex_file.h" #include "obj_ptr.h" -namespace art { +namespace art HIDDEN { namespace mirror { class Object; } // namespace mirror diff --git a/runtime/interpreter/interpreter_cache-inl.h b/runtime/interpreter/interpreter_cache-inl.h index 804d382877..a325ea464a 100644 --- a/runtime/interpreter/interpreter_cache-inl.h +++ b/runtime/interpreter/interpreter_cache-inl.h @@ -21,7 +21,7 @@ #include "thread.h" -namespace art { +namespace art HIDDEN { inline bool InterpreterCache::Get(Thread* self, const void* key, /* out */ size_t* value) { DCHECK(self->GetInterpreterCache() == this) << "Must be called from owning thread"; diff --git a/runtime/interpreter/interpreter_cache.cc b/runtime/interpreter/interpreter_cache.cc index 7e7b294c17..a272d14bba 100644 --- a/runtime/interpreter/interpreter_cache.cc +++ b/runtime/interpreter/interpreter_cache.cc @@ -17,7 +17,7 @@ #include "interpreter_cache.h" #include "thread-inl.h" -namespace art { +namespace art HIDDEN { void InterpreterCache::Clear(Thread* owning_thread) { DCHECK(owning_thread->GetInterpreterCache() == this); diff --git a/runtime/interpreter/interpreter_cache.h b/runtime/interpreter/interpreter_cache.h index 8714bc613c..410fdf58ab 100644 --- a/runtime/interpreter/interpreter_cache.h +++ b/runtime/interpreter/interpreter_cache.h @@ -23,7 +23,7 @@ #include "base/bit_utils.h" #include "base/macros.h" -namespace art { +namespace art HIDDEN { class Thread; @@ -60,7 +60,7 @@ class ALIGNED(16) InterpreterCache { } // Clear the whole cache. It requires the owning thread for DCHECKs. - void Clear(Thread* owning_thread); + EXPORT void Clear(Thread* owning_thread); ALWAYS_INLINE bool Get(Thread* self, const void* key, /* out */ size_t* value); diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index 814f28da75..85ed318390 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -50,7 +50,7 @@ #include "var_handles.h" #include "well_known_classes.h" -namespace art { +namespace art HIDDEN { namespace interpreter { void ThrowNullPointerExceptionFromInterpreter() { diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h index 94cf8f8795..0745a000e7 100644 --- a/runtime/interpreter/interpreter_common.h +++ b/runtime/interpreter/interpreter_common.h @@ -64,7 +64,7 @@ #include "unstarted_runtime.h" #include "verifier/method_verifier.h" -namespace art { +namespace art HIDDEN { namespace interpreter { void ThrowNullPointerExceptionFromInterpreter() diff --git a/runtime/interpreter/interpreter_switch_impl-inl.h b/runtime/interpreter/interpreter_switch_impl-inl.h index ddde26d0cf..db20f3951b 100644 --- a/runtime/interpreter/interpreter_switch_impl-inl.h +++ b/runtime/interpreter/interpreter_switch_impl-inl.h @@ -40,7 +40,7 @@ #include "thread.h" #include "verifier/method_verifier.h" -namespace art { +namespace art HIDDEN { namespace interpreter { // Short-lived helper class which executes single DEX bytecode. It is inlined by compiler. diff --git a/runtime/interpreter/interpreter_switch_impl.h b/runtime/interpreter/interpreter_switch_impl.h index 3a42c217a9..c390692f10 100644 --- a/runtime/interpreter/interpreter_switch_impl.h +++ b/runtime/interpreter/interpreter_switch_impl.h @@ -24,7 +24,7 @@ #include "jvalue.h" #include "obj_ptr.h" -namespace art { +namespace art HIDDEN { class ShadowFrame; class Thread; diff --git a/runtime/interpreter/interpreter_switch_impl0.cc b/runtime/interpreter/interpreter_switch_impl0.cc index b4e5f5061d..65ae2fe333 100644 --- a/runtime/interpreter/interpreter_switch_impl0.cc +++ b/runtime/interpreter/interpreter_switch_impl0.cc @@ -19,7 +19,7 @@ #include "interpreter_switch_impl-inl.h" -namespace art { +namespace art HIDDEN { namespace interpreter { // Explicit definition of ExecuteSwitchImplCpp. diff --git a/runtime/interpreter/interpreter_switch_impl1.cc b/runtime/interpreter/interpreter_switch_impl1.cc index f8f9fcc81a..b9033d926e 100644 --- a/runtime/interpreter/interpreter_switch_impl1.cc +++ b/runtime/interpreter/interpreter_switch_impl1.cc @@ -19,7 +19,7 @@ #include "interpreter_switch_impl-inl.h" -namespace art { +namespace art HIDDEN { namespace interpreter { // Explicit definition of ExecuteSwitchImplCpp. diff --git a/runtime/interpreter/lock_count_data.cc b/runtime/interpreter/lock_count_data.cc index 64b59cd390..ad53d703b3 100644 --- a/runtime/interpreter/lock_count_data.cc +++ b/runtime/interpreter/lock_count_data.cc @@ -23,7 +23,7 @@ #include "mirror/object-inl.h" #include "thread.h" -namespace art { +namespace art HIDDEN { void LockCountData::AddMonitor(Thread* self, mirror::Object* obj) { if (obj == nullptr) { diff --git a/runtime/interpreter/lock_count_data.h b/runtime/interpreter/lock_count_data.h index efa14c5bbc..ec108fc5c1 100644 --- a/runtime/interpreter/lock_count_data.h +++ b/runtime/interpreter/lock_count_data.h @@ -21,8 +21,9 @@ #include <vector> #include "base/locks.h" +#include "base/macros.h" -namespace art { +namespace art HIDDEN { namespace mirror { class Object; diff --git a/runtime/interpreter/mterp/nterp.cc b/runtime/interpreter/mterp/nterp.cc index 668289a37d..bcc59a4032 100644 --- a/runtime/interpreter/mterp/nterp.cc +++ b/runtime/interpreter/mterp/nterp.cc @@ -31,7 +31,7 @@ #include "mirror/string-alloc-inl.h" #include "nterp_helpers.h" -namespace art { +namespace art HIDDEN { namespace interpreter { bool IsNterpSupported() { diff --git a/runtime/interpreter/mterp/nterp.h b/runtime/interpreter/mterp/nterp.h index a7745db716..446fb858ce 100644 --- a/runtime/interpreter/mterp/nterp.h +++ b/runtime/interpreter/mterp/nterp.h @@ -19,11 +19,12 @@ #include "base/array_ref.h" #include "base/globals.h" +#include "base/macros.h" extern "C" void* artNterpAsmInstructionStart[]; extern "C" void* artNterpAsmInstructionEnd[]; -namespace art { +namespace art HIDDEN { class ArtMethod; diff --git a/runtime/interpreter/safe_math.h b/runtime/interpreter/safe_math.h index 25a9353bc0..9b6265f420 100644 --- a/runtime/interpreter/safe_math.h +++ b/runtime/interpreter/safe_math.h @@ -20,7 +20,9 @@ #include <functional> #include <type_traits> -namespace art { +#include "base/macros.h" + +namespace art HIDDEN { namespace interpreter { // Declares a type which is the larger in bit size of the two template parameters. diff --git a/runtime/interpreter/safe_math_test.cc b/runtime/interpreter/safe_math_test.cc index 28087a395b..c88ac4e061 100644 --- a/runtime/interpreter/safe_math_test.cc +++ b/runtime/interpreter/safe_math_test.cc @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { namespace interpreter { TEST(SafeMath, Add) { diff --git a/runtime/interpreter/shadow_frame-inl.h b/runtime/interpreter/shadow_frame-inl.h index 799b2d205d..a05d60f59b 100644 --- a/runtime/interpreter/shadow_frame-inl.h +++ b/runtime/interpreter/shadow_frame-inl.h @@ -21,7 +21,7 @@ #include "obj_ptr-inl.h" -namespace art { +namespace art HIDDEN { template<VerifyObjectFlags kVerifyFlags /*= kDefaultVerifyFlags*/> inline void ShadowFrame::SetVRegReference(size_t i, ObjPtr<mirror::Object> val) diff --git a/runtime/interpreter/shadow_frame.cc b/runtime/interpreter/shadow_frame.cc index 264ec6a997..5ed4224900 100644 --- a/runtime/interpreter/shadow_frame.cc +++ b/runtime/interpreter/shadow_frame.cc @@ -18,7 +18,7 @@ #include "art_method-inl.h" -namespace art { +namespace art HIDDEN { mirror::Object* ShadowFrame::GetThisObject() const { ArtMethod* m = GetMethod(); diff --git a/runtime/interpreter/shadow_frame.h b/runtime/interpreter/shadow_frame.h index 7ca2423856..54c40b2e3c 100644 --- a/runtime/interpreter/shadow_frame.h +++ b/runtime/interpreter/shadow_frame.h @@ -28,7 +28,7 @@ #include "stack_reference.h" #include "verify_object.h" -namespace art { +namespace art HIDDEN { namespace mirror { class Object; diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc index 6cf6746f01..3b5bee80d7 100644 --- a/runtime/interpreter/unstarted_runtime.cc +++ b/runtime/interpreter/unstarted_runtime.cc @@ -66,7 +66,7 @@ #include "unstarted_runtime_list.h" #include "well_known_classes-inl.h" -namespace art { +namespace art HIDDEN { namespace interpreter { using android::base::StringAppendV; diff --git a/runtime/interpreter/unstarted_runtime.h b/runtime/interpreter/unstarted_runtime.h index 8b31f8f441..60092ad958 100644 --- a/runtime/interpreter/unstarted_runtime.h +++ b/runtime/interpreter/unstarted_runtime.h @@ -19,11 +19,12 @@ #include "interpreter.h" +#include "base/macros.h" #include "dex/dex_file.h" #include "jvalue.h" #include "unstarted_runtime_list.h" -namespace art { +namespace art HIDDEN { class ArtMethod; class CodeItemDataAccessor; @@ -47,7 +48,7 @@ namespace interpreter { class UnstartedRuntime { public: - static void Initialize(); + EXPORT static void Initialize(); // For testing. When we destroy the Runtime and create a new one, // we need to reinitialize maps with new `ArtMethod*` keys. diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc index daa1a825de..d21c5ea145 100644 --- a/runtime/interpreter/unstarted_runtime_test.cc +++ b/runtime/interpreter/unstarted_runtime_test.cc @@ -45,7 +45,7 @@ #include "transaction.h" #include "unstarted_runtime_list.h" -namespace art { +namespace art HIDDEN { namespace interpreter { // Deleter to be used with ShadowFrame::CreateDeoptimizedFrame objects. |