diff options
41 files changed, 373 insertions, 139 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000000..cf1832beb4 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Hook Scripts] +check_generated_files_up_to_date = tools/cpp-define-generator/presubmit-check-files-up-to-date diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index bd2c5e3bfc..a16a34b299 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -2266,6 +2266,10 @@ bool OatWriter::LayoutAndWriteDexFile(OutputStream* out, OatDexFile* oat_dex_fil File* raw_file = oat_dex_file->source_.GetRawFile(); dex_file = DexFile::OpenDex(raw_file->Fd(), location, /* verify_checksum */ true, &error_msg); } + if (dex_file == nullptr) { + LOG(ERROR) << "Failed to open dex file for layout:" << error_msg; + return false; + } Options options; options.output_to_memmap_ = true; DexLayout dex_layout(options, profile_compilation_info_, nullptr); 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 <unordered_map> +#include "art_method-inl.h" #include "base/stl_util.h" -#include "art_method.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/Android.bp b/runtime/Android.bp index 276f3043d9..9585ba2d8e 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -208,6 +208,7 @@ cc_defaults { "verifier/reg_type_cache.cc", "verifier/register_line.cc", "verifier/verifier_deps.cc", + "verify_object.cc", "well_known_classes.cc", "zip_archive.cc", @@ -379,6 +380,10 @@ cc_defaults { }, cflags: ["-DBUILDING_LIBART=1"], generated_sources: ["art_operator_srcs"], + // asm_support_gen.h (used by asm_support.h) is generated with cpp-define-generator + generated_headers: ["cpp-define-generator-asm-support"], + // export our headers so the libart-gtest targets can use it as well. + export_generated_headers: ["cpp-define-generator-asm-support"], clang: true, include_dirs: [ "art/cmdline", diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 46f2c08663..c7a94a90dc 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -72,7 +72,7 @@ ADD_TEST_EQ(static_cast<size_t>(1U << POINTER_SIZE_SHIFT), // Import platform-independent constant defines from our autogenerated list. // Export new defines (for assembly use) by editing cpp-define-generator def files. #define DEFINE_CHECK_EQ ADD_TEST_EQ -#include "generated/asm_support_gen.h" +#include "asm_support_gen.h" // Offset of field Thread::tlsPtr_.exception. #define THREAD_EXCEPTION_OFFSET (THREAD_CARD_TABLE_OFFSET + __SIZEOF_POINTER__) diff --git a/runtime/cha.cc b/runtime/cha.cc index e726bdbcb8..d11b12f700 100644 --- a/runtime/cha.cc +++ b/runtime/cha.cc @@ -16,6 +16,7 @@ #include "cha.h" +#include "art_method-inl.h" #include "jit/jit.h" #include "jit/jit_code_cache.h" #include "runtime.h" diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc index 670dadcd4d..158c1d6348 100644 --- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc @@ -20,7 +20,7 @@ #include "indirect_reference_table.h" #include "mirror/object-inl.h" #include "thread-inl.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { diff --git a/runtime/gc/collector/concurrent_copying-inl.h b/runtime/gc/collector/concurrent_copying-inl.h index 7c649525e4..854d0a58ff 100644 --- a/runtime/gc/collector/concurrent_copying-inl.h +++ b/runtime/gc/collector/concurrent_copying-inl.h @@ -22,6 +22,7 @@ #include "gc/accounting/space_bitmap-inl.h" #include "gc/heap.h" #include "gc/space/region_space.h" +#include "mirror/object-inl.h" #include "lock_word.h" namespace art { diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc index 0819ba04f7..f12ad8058d 100644 --- a/runtime/gc/collector/concurrent_copying.cc +++ b/runtime/gc/collector/concurrent_copying.cc @@ -1875,8 +1875,10 @@ class ConcurrentCopying::RefFieldsVisitor { // Scan ref fields of an object. inline void ConcurrentCopying::Scan(mirror::Object* to_ref) { - if (kDisallowReadBarrierDuringScan) { + if (kDisallowReadBarrierDuringScan && !Runtime::Current()->IsActiveTransaction()) { // Avoid all read barriers during visit references to help performance. + // Don't do this in transaction mode because we may read the old value of an field which may + // trigger read barriers. Thread::Current()->ModifyDebugDisallowReadBarrier(1); } DCHECK(!region_space_->IsInFromSpace(to_ref)); @@ -1885,7 +1887,7 @@ inline void ConcurrentCopying::Scan(mirror::Object* to_ref) { // Disable the read barrier for a performance reason. to_ref->VisitReferences</*kVisitNativeRoots*/true, kDefaultVerifyFlags, kWithoutReadBarrier>( visitor, visitor); - if (kDisallowReadBarrierDuringScan) { + if (kDisallowReadBarrierDuringScan && !Runtime::Current()->IsActiveTransaction()) { Thread::Current()->ModifyDebugDisallowReadBarrier(-1); } } diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h index 54f221056a..394e541fd8 100644 --- a/runtime/gc/heap-inl.h +++ b/runtime/gc/heap-inl.h @@ -34,7 +34,7 @@ #include "handle_scope-inl.h" #include "thread-inl.h" #include "utils.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { namespace gc { diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index aa15714595..fc475b5e5a 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -78,6 +78,7 @@ #include "scoped_thread_state_change-inl.h" #include "handle_scope-inl.h" #include "thread_list.h" +#include "verify_object-inl.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/handle_scope-inl.h b/runtime/handle_scope-inl.h index b212d095cb..077f45e8f3 100644 --- a/runtime/handle_scope-inl.h +++ b/runtime/handle_scope-inl.h @@ -23,7 +23,7 @@ #include "handle.h" #include "obj_ptr-inl.h" #include "thread-inl.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { diff --git a/runtime/handle_scope_test.cc b/runtime/handle_scope_test.cc index aab1d9c224..f888482ae5 100644 --- a/runtime/handle_scope_test.cc +++ b/runtime/handle_scope_test.cc @@ -17,10 +17,12 @@ #include <type_traits> #include "base/enums.h" +#include "class_linker-inl.h" #include "common_runtime_test.h" #include "gtest/gtest.h" #include "handle.h" #include "handle_scope-inl.h" +#include "mirror/class-inl.h" #include "mirror/object.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/runtime/indirect_reference_table-inl.h b/runtime/indirect_reference_table-inl.h index 0e66ae96b5..24ee22759c 100644 --- a/runtime/indirect_reference_table-inl.h +++ b/runtime/indirect_reference_table-inl.h @@ -25,7 +25,7 @@ #include "gc_root-inl.h" #include "obj_ptr-inl.h" #include "runtime-inl.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { namespace mirror { diff --git a/runtime/indirect_reference_table.cc b/runtime/indirect_reference_table.cc index c7371191b7..9fbb2e9930 100644 --- a/runtime/indirect_reference_table.cc +++ b/runtime/indirect_reference_table.cc @@ -25,7 +25,6 @@ #include "scoped_thread_state_change-inl.h" #include "thread.h" #include "utils.h" -#include "verify_object-inl.h" #include <cstdlib> diff --git a/runtime/jdwp/object_registry.cc b/runtime/jdwp/object_registry.cc index 170887e397..4615574947 100644 --- a/runtime/jdwp/object_registry.cc +++ b/runtime/jdwp/object_registry.cc @@ -19,6 +19,7 @@ #include "handle_scope-inl.h" #include "jni_internal.h" #include "mirror/class.h" +#include "mirror/throwable.h" #include "obj_ptr-inl.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 6a65e1271f..5465e37993 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -635,23 +635,6 @@ inline void Class::SetClinitThreadId(pid_t new_clinit_thread_id) { } } -template<VerifyObjectFlags kVerifyFlags> -inline uint32_t Class::GetAccessFlags() { - // Check class is loaded/retired or this is java.lang.String that has a - // circularity issue during loading the names of its members - DCHECK(IsIdxLoaded<kVerifyFlags>() || IsRetired<kVerifyFlags>() || - IsErroneous<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>() || - this == String::GetJavaLangString()) - << "IsIdxLoaded=" << IsIdxLoaded<kVerifyFlags>() - << " IsRetired=" << IsRetired<kVerifyFlags>() - << " IsErroneous=" << - IsErroneous<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>() - << " IsString=" << (this == String::GetJavaLangString()) - << " status= " << GetStatus<kVerifyFlags>() - << " descriptor=" << PrettyDescriptor(); - return GetField32<kVerifyFlags>(AccessFlagsOffset()); -} - inline String* Class::GetName() { return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(Class, name_)); } diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc index f08d4daf95..1b8f3f83e7 100644 --- a/runtime/mirror/class.cc +++ b/runtime/mirror/class.cc @@ -1345,5 +1345,26 @@ std::string Class::PrettyClassAndClassLoader() { return result; } +template<VerifyObjectFlags kVerifyFlags> void Class::GetAccessFlagsDCheck() { + // Check class is loaded/retired or this is java.lang.String that has a + // circularity issue during loading the names of its members + DCHECK(IsIdxLoaded<kVerifyFlags>() || IsRetired<kVerifyFlags>() || + IsErroneous<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>() || + this == String::GetJavaLangString()) + << "IsIdxLoaded=" << IsIdxLoaded<kVerifyFlags>() + << " IsRetired=" << IsRetired<kVerifyFlags>() + << " IsErroneous=" << + IsErroneous<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>() + << " IsString=" << (this == String::GetJavaLangString()) + << " status= " << GetStatus<kVerifyFlags>() + << " descriptor=" << PrettyDescriptor(); +} +// Instantiate the common cases. +template void Class::GetAccessFlagsDCheck<kVerifyNone>(); +template void Class::GetAccessFlagsDCheck<kVerifyThis>(); +template void Class::GetAccessFlagsDCheck<kVerifyReads>(); +template void Class::GetAccessFlagsDCheck<kVerifyWrites>(); +template void Class::GetAccessFlagsDCheck<kVerifyAll>(); + } // namespace mirror } // namespace art diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index c9f27ad53f..f8b8cdeb3d 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -231,7 +231,13 @@ class MANAGED Class FINAL : public Object { } template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> - ALWAYS_INLINE uint32_t GetAccessFlags() REQUIRES_SHARED(Locks::mutator_lock_); + ALWAYS_INLINE uint32_t GetAccessFlags() REQUIRES_SHARED(Locks::mutator_lock_) { + if (kIsDebugBuild) { + GetAccessFlagsDCheck<kVerifyFlags>(); + } + return GetField32<kVerifyFlags>(AccessFlagsOffset()); + } + static MemberOffset AccessFlagsOffset() { return OFFSET_OF_OBJECT_MEMBER(Class, access_flags_); } @@ -1397,6 +1403,9 @@ class MANAGED Class FINAL : public Object { bool ProxyDescriptorEquals(const char* match) REQUIRES_SHARED(Locks::mutator_lock_); + template<VerifyObjectFlags kVerifyFlags> + void GetAccessFlagsDCheck() REQUIRES_SHARED(Locks::mutator_lock_); + // Check that the pointer size matches the one in the class linker. ALWAYS_INLINE static void CheckPointerSize(PointerSize pointer_size); diff --git a/runtime/mirror/method_handle_impl.h b/runtime/mirror/method_handle_impl.h index dca30626e0..53d267b52c 100644 --- a/runtime/mirror/method_handle_impl.h +++ b/runtime/mirror/method_handle_impl.h @@ -19,7 +19,7 @@ #include "class.h" #include "gc_root.h" -#include "object.h" +#include "object-inl.h" #include "method_handles.h" #include "method_type.h" diff --git a/runtime/mirror/method_type_test.cc b/runtime/mirror/method_type_test.cc index 03ab93069c..637bafd75e 100644 --- a/runtime/mirror/method_type_test.cc +++ b/runtime/mirror/method_type_test.cc @@ -19,12 +19,13 @@ #include <string> #include <vector> +#include "class-inl.h" #include "class_linker.h" +#include "class_loader.h" #include "common_runtime_test.h" #include "handle_scope-inl.h" -#include "runtime/mirror/class.h" -#include "runtime/mirror/class_loader.h" -#include "scoped_thread_state_change.h" +#include "object_array-inl.h" +#include "scoped_thread_state_change-inl.h" namespace art { namespace mirror { diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h index 354410e6bf..8e591e4434 100644 --- a/runtime/mirror/object-inl.h +++ b/runtime/mirror/object-inl.h @@ -142,8 +142,10 @@ inline void Object::Wait(Thread* self, int64_t ms, int32_t ns) { } inline uint32_t Object::GetReadBarrierState(uintptr_t* fake_address_dependency) { -#ifdef USE_BAKER_READ_BARRIER - CHECK(kUseBakerReadBarrier); + if (!kUseBakerReadBarrier) { + LOG(FATAL) << "Unreachable"; + UNREACHABLE(); + } #if defined(__arm__) uintptr_t obj = reinterpret_cast<uintptr_t>(this); uintptr_t result; @@ -190,37 +192,29 @@ inline uint32_t Object::GetReadBarrierState(uintptr_t* fake_address_dependency) UNREACHABLE(); UNUSED(fake_address_dependency); #endif -#else // !USE_BAKER_READ_BARRIER - LOG(FATAL) << "Unreachable"; - UNREACHABLE(); - UNUSED(fake_address_dependency); -#endif } inline uint32_t Object::GetReadBarrierState() { -#ifdef USE_BAKER_READ_BARRIER + if (!kUseBakerReadBarrier) { + LOG(FATAL) << "Unreachable"; + UNREACHABLE(); + } DCHECK(kUseBakerReadBarrier); LockWord lw(GetField<uint32_t, /*kIsVolatile*/false>(OFFSET_OF_OBJECT_MEMBER(Object, monitor_))); uint32_t rb_state = lw.ReadBarrierState(); DCHECK(ReadBarrier::IsValidReadBarrierState(rb_state)) << rb_state; return rb_state; -#else - LOG(FATAL) << "Unreachable"; - UNREACHABLE(); -#endif } inline uint32_t Object::GetReadBarrierStateAcquire() { -#ifdef USE_BAKER_READ_BARRIER - DCHECK(kUseBakerReadBarrier); + if (!kUseBakerReadBarrier) { + LOG(FATAL) << "Unreachable"; + UNREACHABLE(); + } LockWord lw(GetFieldAcquire<uint32_t>(OFFSET_OF_OBJECT_MEMBER(Object, monitor_))); uint32_t rb_state = lw.ReadBarrierState(); DCHECK(ReadBarrier::IsValidReadBarrierState(rb_state)) << rb_state; return rb_state; -#else - LOG(FATAL) << "Unreachable"; - UNREACHABLE(); -#endif } inline uint32_t Object::GetMarkBit() { @@ -233,23 +227,22 @@ inline uint32_t Object::GetMarkBit() { } inline void Object::SetReadBarrierState(uint32_t rb_state) { -#ifdef USE_BAKER_READ_BARRIER - DCHECK(kUseBakerReadBarrier); + if (!kUseBakerReadBarrier) { + LOG(FATAL) << "Unreachable"; + UNREACHABLE(); + } DCHECK(ReadBarrier::IsValidReadBarrierState(rb_state)) << rb_state; LockWord lw = GetLockWord(false); lw.SetReadBarrierState(rb_state); SetLockWord(lw, false); -#else - LOG(FATAL) << "Unreachable"; - UNREACHABLE(); - UNUSED(rb_state); -#endif } template<bool kCasRelease> inline bool Object::AtomicSetReadBarrierState(uint32_t expected_rb_state, uint32_t rb_state) { -#ifdef USE_BAKER_READ_BARRIER - DCHECK(kUseBakerReadBarrier); + if (!kUseBakerReadBarrier) { + LOG(FATAL) << "Unreachable"; + UNREACHABLE(); + } DCHECK(ReadBarrier::IsValidReadBarrierState(expected_rb_state)) << expected_rb_state; DCHECK(ReadBarrier::IsValidReadBarrierState(rb_state)) << rb_state; LockWord expected_lw; @@ -272,11 +265,6 @@ inline bool Object::AtomicSetReadBarrierState(uint32_t expected_rb_state, uint32 CasLockWordWeakRelease(expected_lw, new_lw) : CasLockWordWeakRelaxed(expected_lw, new_lw))); return true; -#else - UNUSED(expected_rb_state, rb_state); - LOG(FATAL) << "Unreachable"; - UNREACHABLE(); -#endif } inline bool Object::AtomicSetMarkBit(uint32_t expected_mark_bit, uint32_t mark_bit) { @@ -691,19 +679,6 @@ inline void Object::SetFieldShortVolatile(MemberOffset field_offset, int16_t new field_offset, new_value); } -template<VerifyObjectFlags kVerifyFlags, bool kIsVolatile> -inline int32_t Object::GetField32(MemberOffset field_offset) { - if (kVerifyFlags & kVerifyThis) { - VerifyObject(this); - } - return GetField<int32_t, kIsVolatile>(field_offset); -} - -template<VerifyObjectFlags kVerifyFlags> -inline int32_t Object::GetField32Volatile(MemberOffset field_offset) { - return GetField32<kVerifyFlags, true>(field_offset); -} - template<bool kTransactionActive, bool kCheckTransaction, VerifyObjectFlags kVerifyFlags, bool kIsVolatile> inline void Object::SetField32(MemberOffset field_offset, int32_t new_value) { @@ -854,28 +829,6 @@ inline void Object::SetField64Volatile(MemberOffset field_offset, int64_t new_va new_value); } -template<typename kSize, bool kIsVolatile> -inline void Object::SetField(MemberOffset field_offset, kSize new_value) { - uint8_t* raw_addr = reinterpret_cast<uint8_t*>(this) + field_offset.Int32Value(); - kSize* addr = reinterpret_cast<kSize*>(raw_addr); - if (kIsVolatile) { - reinterpret_cast<Atomic<kSize>*>(addr)->StoreSequentiallyConsistent(new_value); - } else { - reinterpret_cast<Atomic<kSize>*>(addr)->StoreJavaData(new_value); - } -} - -template<typename kSize, bool kIsVolatile> -inline kSize Object::GetField(MemberOffset field_offset) { - const uint8_t* raw_addr = reinterpret_cast<const uint8_t*>(this) + field_offset.Int32Value(); - const kSize* addr = reinterpret_cast<const kSize*>(raw_addr); - if (kIsVolatile) { - return reinterpret_cast<const Atomic<kSize>*>(addr)->LoadSequentiallyConsistent(); - } else { - return reinterpret_cast<const Atomic<kSize>*>(addr)->LoadJavaData(); - } -} - template<typename kSize> inline kSize Object::GetFieldAcquire(MemberOffset field_offset) { const uint8_t* raw_addr = reinterpret_cast<const uint8_t*>(this) + field_offset.Int32Value(); diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h index db58a60994..4541ce2a42 100644 --- a/runtime/mirror/object.h +++ b/runtime/mirror/object.h @@ -17,6 +17,7 @@ #ifndef ART_RUNTIME_MIRROR_OBJECT_H_ #define ART_RUNTIME_MIRROR_OBJECT_H_ +#include "atomic.h" #include "base/casts.h" #include "base/enums.h" #include "globals.h" @@ -432,11 +433,18 @@ class MANAGED LOCKABLE Object { template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, bool kIsVolatile = false> ALWAYS_INLINE int32_t GetField32(MemberOffset field_offset) - REQUIRES_SHARED(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_) { + if (kVerifyFlags & kVerifyThis) { + VerifyObject(this); + } + return GetField<int32_t, kIsVolatile>(field_offset); + } template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> ALWAYS_INLINE int32_t GetField32Volatile(MemberOffset field_offset) - REQUIRES_SHARED(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_) { + return GetField32<kVerifyFlags, true>(field_offset); + } template<bool kTransactionActive, bool kCheckTransaction = true, VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, bool kIsVolatile = false> @@ -611,10 +619,28 @@ class MANAGED LOCKABLE Object { private: template<typename kSize, bool kIsVolatile> ALWAYS_INLINE void SetField(MemberOffset field_offset, kSize new_value) - REQUIRES_SHARED(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_) { + uint8_t* raw_addr = reinterpret_cast<uint8_t*>(this) + field_offset.Int32Value(); + kSize* addr = reinterpret_cast<kSize*>(raw_addr); + if (kIsVolatile) { + reinterpret_cast<Atomic<kSize>*>(addr)->StoreSequentiallyConsistent(new_value); + } else { + reinterpret_cast<Atomic<kSize>*>(addr)->StoreJavaData(new_value); + } + } + template<typename kSize, bool kIsVolatile> ALWAYS_INLINE kSize GetField(MemberOffset field_offset) - REQUIRES_SHARED(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_) { + const uint8_t* raw_addr = reinterpret_cast<const uint8_t*>(this) + field_offset.Int32Value(); + const kSize* addr = reinterpret_cast<const kSize*>(raw_addr); + if (kIsVolatile) { + return reinterpret_cast<const Atomic<kSize>*>(addr)->LoadSequentiallyConsistent(); + } else { + return reinterpret_cast<const Atomic<kSize>*>(addr)->LoadJavaData(); + } + } + // Get a field with acquire semantics. template<typename kSize> ALWAYS_INLINE kSize GetFieldAcquire(MemberOffset field_offset) diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc index ea266d131d..f1d6ff5f70 100644 --- a/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc @@ -25,7 +25,7 @@ #include "scoped_fast_native_object_access-inl.h" #include "scoped_thread_state_change-inl.h" #include "ScopedLocalRef.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc index fcb017545a..195091f8ab 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -25,7 +25,7 @@ #include "ScopedUtfChars.h" #include "thread.h" #include "thread_list.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { diff --git a/runtime/native/java_lang_reflect_Proxy.cc b/runtime/native/java_lang_reflect_Proxy.cc index ece0338c93..70cd6aaae2 100644 --- a/runtime/native/java_lang_reflect_Proxy.cc +++ b/runtime/native/java_lang_reflect_Proxy.cc @@ -22,7 +22,7 @@ #include "mirror/object_array.h" #include "mirror/string.h" #include "scoped_fast_native_object_access-inl.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc index 33bd0f311d..a46b47075c 100644 --- a/runtime/oat_file_manager.cc +++ b/runtime/oat_file_manager.cc @@ -22,6 +22,7 @@ #include "android-base/stringprintf.h" +#include "art_field-inl.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/systrace.h" @@ -32,11 +33,13 @@ #include "handle_scope-inl.h" #include "jni_internal.h" #include "mirror/class_loader.h" +#include "mirror/object-inl.h" #include "oat_file_assistant.h" #include "obj_ptr-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-inl.h" #include "thread_list.h" +#include "well_known_classes.h" namespace art { diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/runtime/openjdkjvm/OpenjdkJvm.cc index 2f51e27b2d..bdaad20d7e 100644 --- a/runtime/openjdkjvm/OpenjdkJvm.cc +++ b/runtime/openjdkjvm/OpenjdkJvm.cc @@ -46,7 +46,7 @@ #include "scoped_thread_state_change-inl.h" #include "ScopedUtfChars.h" #include "mirror/class_loader.h" -#include "verify_object-inl.h" +#include "verify_object.h" #include "base/logging.h" #include "base/macros.h" #include "../../libcore/ojluni/src/main/native/jvm.h" // TODO(narayan): fix it diff --git a/runtime/scoped_thread_state_change-inl.h b/runtime/scoped_thread_state_change-inl.h index d4469f4357..000da59bd2 100644 --- a/runtime/scoped_thread_state_change-inl.h +++ b/runtime/scoped_thread_state_change-inl.h @@ -110,6 +110,10 @@ inline ScopedObjectAccessUnchecked::ScopedObjectAccessUnchecked(Thread* self) Locks::mutator_lock_->AssertSharedHeld(Self()); } +inline ScopedObjectAccess::ScopedObjectAccess(JNIEnv* env) : ScopedObjectAccessUnchecked(env) {} +inline ScopedObjectAccess::ScopedObjectAccess(Thread* self) : ScopedObjectAccessUnchecked(self) {} +inline ScopedObjectAccess::~ScopedObjectAccess() {} + inline ScopedThreadSuspension::ScopedThreadSuspension(Thread* self, ThreadState suspended_state) : self_(self), suspended_state_(suspended_state) { DCHECK(self_ != nullptr); diff --git a/runtime/scoped_thread_state_change.h b/runtime/scoped_thread_state_change.h index b4992586ce..24199f76b6 100644 --- a/runtime/scoped_thread_state_change.h +++ b/runtime/scoped_thread_state_change.h @@ -159,16 +159,14 @@ class ScopedObjectAccess : public ScopedObjectAccessUnchecked { public: ALWAYS_INLINE explicit ScopedObjectAccess(JNIEnv* env) REQUIRES(!Locks::thread_suspend_count_lock_) - SHARED_LOCK_FUNCTION(Locks::mutator_lock_) - : ScopedObjectAccessUnchecked(env) {} + SHARED_LOCK_FUNCTION(Locks::mutator_lock_); ALWAYS_INLINE explicit ScopedObjectAccess(Thread* self) REQUIRES(!Locks::thread_suspend_count_lock_) - SHARED_LOCK_FUNCTION(Locks::mutator_lock_) - : ScopedObjectAccessUnchecked(self) {} + SHARED_LOCK_FUNCTION(Locks::mutator_lock_); // Base class will release share of lock. Invoked after this destructor. - ~ScopedObjectAccess() UNLOCK_FUNCTION(Locks::mutator_lock_) ALWAYS_INLINE {} + ~ScopedObjectAccess() UNLOCK_FUNCTION(Locks::mutator_lock_) ALWAYS_INLINE; private: // TODO: remove this constructor. It is used by check JNI's ScopedCheck to make it believe that diff --git a/runtime/stack.cc b/runtime/stack.cc index 5ad00a4e55..6e0569bb5d 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -37,7 +37,7 @@ #include "runtime.h" #include "thread.h" #include "thread_list.h" -#include "verify_object-inl.h" +#include "verify_object.h" namespace art { diff --git a/runtime/thread.cc b/runtime/thread.cc index d843de5e7f..632a380bf0 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -77,7 +77,7 @@ #include "thread-inl.h" #include "utils.h" #include "verifier/method_verifier.h" -#include "verify_object-inl.h" +#include "verify_object.h" #include "well_known_classes.h" #include "interpreter/interpreter.h" diff --git a/runtime/transaction.cc b/runtime/transaction.cc index 25369686fd..f94bb65881 100644 --- a/runtime/transaction.cc +++ b/runtime/transaction.cc @@ -262,7 +262,7 @@ void Transaction::VisitObjectLogs(RootVisitor* visitor) { std::list<ObjectPair> moving_roots; // Visit roots. - for (auto it : object_logs_) { + for (auto& it : object_logs_) { it.second.VisitRoots(visitor); mirror::Object* old_root = it.first; mirror::Object* new_root = old_root; @@ -289,7 +289,7 @@ void Transaction::VisitArrayLogs(RootVisitor* visitor) { typedef std::pair<mirror::Array*, mirror::Array*> ArrayPair; std::list<ArrayPair> moving_roots; - for (auto it : array_logs_) { + for (auto& it : array_logs_) { mirror::Array* old_root = it.first; CHECK(!old_root->IsObjectArray()); mirror::Array* new_root = old_root; @@ -456,7 +456,7 @@ void Transaction::ObjectLog::UndoFieldWrite(mirror::Object* obj, MemberOffset fi } void Transaction::ObjectLog::VisitRoots(RootVisitor* visitor) { - for (auto it : field_values_) { + for (auto& it : field_values_) { FieldValue& field_value = it.second; if (field_value.kind == ObjectLog::kReference) { visitor->VisitRootIfNonNull(reinterpret_cast<mirror::Object**>(&field_value.value), diff --git a/runtime/verify_object-inl.h b/runtime/verify_object-inl.h index 43151dd425..363fde220d 100644 --- a/runtime/verify_object-inl.h +++ b/runtime/verify_object-inl.h @@ -19,33 +19,11 @@ #include "verify_object.h" -#include "gc/heap.h" #include "mirror/object-inl.h" #include "obj_ptr-inl.h" namespace art { -inline void VerifyObject(ObjPtr<mirror::Object> obj) { - if (kVerifyObjectSupport > kVerifyObjectModeDisabled && obj != nullptr) { - if (kVerifyObjectSupport > kVerifyObjectModeFast) { - // Slow object verification, try the heap right away. - Runtime::Current()->GetHeap()->VerifyObjectBody(obj); - } else { - // Fast object verification, only call the heap if our quick sanity tests fail. The heap will - // print the diagnostic message. - bool failed = !IsAligned<kObjectAlignment>(obj.Ptr()); - if (!failed) { - mirror::Class* c = obj->GetClass<kVerifyNone>(); - failed = failed || !IsAligned<kObjectAlignment>(c); - failed = failed || !VerifyClassClass(c); - } - if (UNLIKELY(failed)) { - Runtime::Current()->GetHeap()->VerifyObjectBody(obj); - } - } - } -} - inline bool VerifyClassClass(ObjPtr<mirror::Class> c) { if (UNLIKELY(c == nullptr)) { return false; diff --git a/runtime/verify_object.cc b/runtime/verify_object.cc new file mode 100644 index 0000000000..a031a07a94 --- /dev/null +++ b/runtime/verify_object.cc @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "verify_object-inl.h" + +#include "base/bit_utils.h" +#include "gc/heap.h" +#include "globals.h" +#include "mirror/object-inl.h" +#include "obj_ptr-inl.h" +#include "runtime.h" + +namespace art { + +void VerifyObjectImpl(ObjPtr<mirror::Object> obj) { + if (kVerifyObjectSupport > kVerifyObjectModeFast) { + // Slow object verification, try the heap right away. + Runtime::Current()->GetHeap()->VerifyObjectBody(obj); + } else { + // Fast object verification, only call the heap if our quick sanity tests fail. The heap will + // print the diagnostic message. + bool failed = !IsAligned<kObjectAlignment>(obj.Ptr()); + if (!failed) { + mirror::Class* c = obj->GetClass<kVerifyNone>(); + failed = failed || !IsAligned<kObjectAlignment>(c); + failed = failed || !VerifyClassClass(c); + } + if (UNLIKELY(failed)) { + Runtime::Current()->GetHeap()->VerifyObjectBody(obj); + } + } +} + +} // namespace art diff --git a/runtime/verify_object.h b/runtime/verify_object.h index 384e56f7f4..519f7f5f5a 100644 --- a/runtime/verify_object.h +++ b/runtime/verify_object.h @@ -53,7 +53,16 @@ static constexpr VerifyObjectFlags kDefaultVerifyFlags = kVerifyNone; static constexpr VerifyObjectMode kVerifyObjectSupport = kDefaultVerifyFlags != 0 ? kVerifyObjectModeFast : kVerifyObjectModeDisabled; -ALWAYS_INLINE void VerifyObject(ObjPtr<mirror::Object> obj) NO_THREAD_SAFETY_ANALYSIS; +// Implements the actual object checks. +void VerifyObjectImpl(ObjPtr<mirror::Object> obj) NO_THREAD_SAFETY_ANALYSIS; + +// Is a front to optimize out any calls if no verification is enabled. +ALWAYS_INLINE +static inline void VerifyObject(ObjPtr<mirror::Object> obj) NO_THREAD_SAFETY_ANALYSIS { + if (kVerifyObjectSupport > kVerifyObjectModeDisabled && obj != nullptr) { + VerifyObjectImpl(obj); + } +} // Check that c.getClass() == c.getClass().getClass(). ALWAYS_INLINE bool VerifyClassClass(ObjPtr<mirror::Class> c) NO_THREAD_SAFETY_ANALYSIS; diff --git a/test/626-const-class-linking/clear_dex_cache_types.cc b/test/626-const-class-linking/clear_dex_cache_types.cc index b035896166..c0aedc199f 100644 --- a/test/626-const-class-linking/clear_dex_cache_types.cc +++ b/test/626-const-class-linking/clear_dex_cache_types.cc @@ -15,6 +15,9 @@ */ #include "jni.h" +#include "mirror/class-inl.h" +#include "mirror/class_loader.h" +#include "mirror/dex_cache-inl.h" #include "object_lock.h" #include "scoped_thread_state_change-inl.h" diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp index d792e906ef..acb53a1ff9 100644 --- a/tools/cpp-define-generator/Android.bp +++ b/tools/cpp-define-generator/Android.bp @@ -34,3 +34,14 @@ art_cc_binary { "libbase", ], } + +// Note: See $OUT_DIR/soong/build.ninja +// For the exact filename that this generates to run make command on just +// this rule later. +genrule { + name: "cpp-define-generator-asm-support", + out: ["asm_support_gen.h"], + tools: ["cpp-define-generator-data"], + tool_files: ["verify-asm-support"], + cmd: "$(location verify-asm-support) --quiet \"$(location cpp-define-generator-data)\" \"$(out)\"" +} diff --git a/tools/cpp-define-generator/presubmit-check-files-up-to-date b/tools/cpp-define-generator/presubmit-check-files-up-to-date new file mode 100755 index 0000000000..67a702adc7 --- /dev/null +++ b/tools/cpp-define-generator/presubmit-check-files-up-to-date @@ -0,0 +1,67 @@ +#!/bin/bash +# +# Copyright (C) 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# --------------------------------------------------------------------------- + +# Generates asm_support_gen.h into a temporary location. +# Then verifies it is the same as our local stored copy. + +GEN_TOOL=cpp-define-generator-data + +if ! which "$GEN_TOOL"; then + echo "ERROR: Please build cpp-define-generator-data or source build/envsetup.sh" >&2 + exit 1 +fi + +####################### +####################### + +PREUPLOAD_COMMIT_COPY="$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXX)" +BUILD_COPY="$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXX)" + +function finish() { + # Delete temp files. + [[ -f "$PREUPLOAD_COMMIT_COPY" ]] && rm "$PREUPLOAD_COMMIT_COPY" + [[ -f "$BUILD_COPY" ]] && rm "$BUILD_COPY" +} +trap finish EXIT + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +ART_DIR="$( cd "$DIR/../.." && pwd )" +ASM_SUPPORT_GEN_CHECKED_IN_COPY="runtime/generated/asm_support_gen.h" + +# Repo upload hook runs inside of the top-level git directory. +# If we run this script manually, be in the right place for git. +cd "$ART_DIR" + +if [[ -z $PREUPLOAD_COMMIT ]]; then + echo "WARNING: Not running as a pre-upload hook. Assuming commit to check = 'HEAD'" + PREUPLOAD_COMMIT=HEAD +fi + +# Get version we are about to push into git. +git show "$PREUPLOAD_COMMIT:$ASM_SUPPORT_GEN_CHECKED_IN_COPY" > "$PREUPLOAD_COMMIT_COPY" || exit 1 +# Get version that our build would have made. +"$GEN_TOOL" > "$BUILD_COPY" || exit 1 + +if ! diff "$PREUPLOAD_COMMIT_COPY" "$BUILD_COPY"; then + echo "asm-support: ERROR: Checked-in copy of '$ASM_SUPPORT_GEN_CHECKED_IN_COPY' " >&2 + echo " has diverged from the build copy." >&2 + echo " Please re-run the 'generate-asm-support' command to resync the header." >&2 + exit 1 +fi + +# Success. Print nothing to avoid spamming users. diff --git a/tools/cpp-define-generator/verify-asm-support b/tools/cpp-define-generator/verify-asm-support new file mode 100755 index 0000000000..745b1153c9 --- /dev/null +++ b/tools/cpp-define-generator/verify-asm-support @@ -0,0 +1,101 @@ +#!/bin/bash +# +# Copyright (C) 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# --------------------------------------------------------------------------- + +# Generates asm_support_gen.h into the $OUT directory in the build. +# Then verifies that it is the same as in runtime/generated/asm_support_gen.h + +# Validates that art/runtime/generated/asm_support_gen.h +# - This must be run after a build since it uses cpp-define-generator-data + +# Path to asm_support_gen.h that we check into our git repository. +ASM_SUPPORT_GEN_CHECKED_IN_COPY="runtime/generated/asm_support_gen.h" +# Instead of producing an error if checked-in copy differs from the generated version, +# overwrite the local checked-in copy instead. +OVERWRITE_CHECKED_IN_COPY_IF_CHANGED="n" + +####################### +####################### + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +ART_DIR="$( cd "$DIR/../.." && pwd )" +ABS_ASM_SUPPORT_GEN_CHECKED_IN_COPY="$ART_DIR/runtime/generated/asm_support_gen.h" + +# Sanity check that we haven't moved the file around. +# If we did, perhaps the above constant should be updated. +if ! [[ -f "$ABS_ASM_SUPPORT_GEN_CHECKED_IN_COPY" ]]; then + echo "ERROR: Missing asm_support_gen.h, expected to be in '$ABS_ASM_SUPPORT_GEN_CHECKED_IN_COPY'" >&2 + exit 1 +fi + +# The absolute path to cpp-define-generator is in $1 +# Generate the file as part of the build into the out location specified by $2. + +# Compare that the generated file matches our golden copy that's checked into git. +# If not, it is a fatal error and the user needs to run 'generate-asm-support' to rebuild. + +if [[ $# -lt 2 ]]; then + echo "Usage: $0 [--quiet] [--presubmit] <path-to-cpp-define-generator-data-binary> <output-file>'" >&2 + exit 1 +fi + +# Supress 'chatty' messages during the build. +# If anything is printed in a success case then +# the main Android build can't reuse the same line for +# showing multiple commands being executed. +QUIET=false +if [[ "$1" == "--quiet" ]]; then + QUIET=true + shift +fi + +CPP_DEFINE_GENERATOR_TOOL="$1" +OUTPUT_FILE="$2" + +function pecho() { + if ! $QUIET; then + echo "$@" + fi +} + +# Generate the header. Print the command we're running to console for readability. +pecho "cpp-define-generator-data > \"$OUTPUT_FILE\"" +"$CPP_DEFINE_GENERATOR_TOOL" > "$OUTPUT_FILE" +retval="$?" + +if [[ $retval -ne 0 ]]; then + echo "verify-asm-support: FATAL: Error while running cpp-define-generator-data" >&2 + exit $retval +fi + +if ! diff "$ABS_ASM_SUPPORT_GEN_CHECKED_IN_COPY" "$OUTPUT_FILE"; then + + if [[ $OVERWRITE_CHECKED_IN_COPY_IF_CHANGED == "y" ]]; then + cp "$OUTPUT_FILE" "$ABS_ASM_SUPPORT_GEN_CHECKED_IN_COPY" + echo "verify-asm-support: OK: Overwrote '$ASM_SUPPORT_GEN_CHECKED_IN_COPY' with build copy." + echo " Please 'git add $ASM_SUPPORT_GEN_CHECKED_IN_COPY'." + else + echo "---------------------------------------------------------------------------------------------" >&2 + echo "verify-asm-support: ERROR: Checked-in copy of '$ASM_SUPPORT_GEN_CHECKED_IN_COPY' " >&2 + echo " has diverged from the build copy." >&2 + echo " Please re-run the 'generate-asm-support' command to resync the header." >&2 + [[ -f "$OUTPUT_FILE" ]] && rm "$OUTPUT_FILE" + exit 1 + fi +fi + +pecho "verify-asm-support: SUCCESS. Built '$OUTPUT_FILE' which matches our checked in copy." |