Clean up Constructor/Method/Field construction.
Simplify the code by ignoring active transactions. Writing
to fields of a newly allocated object does not need to be
recorded as aborting the transaction removes all references
to the new object and it's unnecessary to roll back writes
to unreachable object's fields.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots.
Change-Id: Ib5cd60c003d2ad3e6a246ff86d6b9288428c60ee
diff --git a/runtime/native/java_lang_invoke_MethodHandleImpl.cc b/runtime/native/java_lang_invoke_MethodHandleImpl.cc
index 0b26bd7..c1060fe 100644
--- a/runtime/native/java_lang_invoke_MethodHandleImpl.cc
+++ b/runtime/native/java_lang_invoke_MethodHandleImpl.cc
@@ -40,23 +40,18 @@
// a Method for method invokers and a Constructor for constructors.
const mirror::MethodHandle::Kind handle_kind = handle->GetHandleKind();
- // We check this here because we pass false to CreateFromArtField and
- // CreateFromArtMethod.
- DCHECK(!Runtime::Current()->IsActiveTransaction());
-
MutableHandle<mirror::Object> h_object(hs.NewHandle<mirror::Object>(nullptr));
if (handle_kind >= mirror::MethodHandle::kFirstAccessorKind) {
ArtField* const field = handle->GetTargetField();
- h_object.Assign(mirror::Field::CreateFromArtField<kRuntimePointerSize, false>(
+ h_object.Assign(mirror::Field::CreateFromArtField<kRuntimePointerSize>(
soa.Self(), field, /* force_resolve= */ false));
} else {
ArtMethod* const method = handle->GetTargetMethod();
if (method->IsConstructor()) {
- h_object.Assign(mirror::Constructor::CreateFromArtMethod<kRuntimePointerSize, false>(
- soa.Self(), method));
+ h_object.Assign(
+ mirror::Constructor::CreateFromArtMethod<kRuntimePointerSize>(soa.Self(), method));
} else {
- h_object.Assign(mirror::Method::CreateFromArtMethod<kRuntimePointerSize, false>(
- soa.Self(), method));
+ h_object.Assign(mirror::Method::CreateFromArtMethod<kRuntimePointerSize>(soa.Self(), method));
}
}