Visit proxy methods reference arguments when visiting Quick frames roots.
The arguments of a proxy method, stored in the proxy method's stack
frame, need to be visited as GC roots. This is especially important
in the case of a moving GC, where these reference arguments may be
moved like any object. Previously, we would only visit the target
(`this` argument) of proxy methods when visiting Quick frames roots.
Test: art/test/testrunner/testrunner.py --gcstress -t 999-proxy-method-arguments
Test: m test-art-host
Test: m test-art-target
Bug: 73149739
Bug: 70216372
Bug: 67679263
Change-Id: Ieacc966ab1038935600f2193c14e6ca01e88602e
diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h
index 6cd9dc1..795faa8 100644
--- a/runtime/entrypoints/quick/quick_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_entrypoints.h
@@ -38,6 +38,7 @@
class ArtMethod;
template<class MirrorType> class GcRoot;
+template<class MirrorType> class StackReference;
class Thread;
// Pointers to functions that are called by quick compiler generated code via thread-local storage.
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index a8c328f..344e5be 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -649,10 +649,6 @@
REQUIRES_SHARED(Locks::mutator_lock_) {
return QuickArgumentVisitor::GetProxyThisObjectReference(sp)->AsMirrorPtr();
}
-extern "C" StackReference<mirror::Object>* artQuickGetProxyThisObjectReference(ArtMethod** sp)
- REQUIRES_SHARED(Locks::mutator_lock_) {
- return QuickArgumentVisitor::GetProxyThisObjectReference(sp);
-}
// Visits arguments on the stack placing them into the shadow frame.
class BuildQuickShadowFrameVisitor FINAL : public QuickArgumentVisitor {
@@ -953,7 +949,8 @@
std::vector<jvalue> args;
uint32_t shorty_len = 0;
const char* shorty = non_proxy_method->GetShorty(&shorty_len);
- BuildQuickArgumentVisitor local_ref_visitor(sp, false, shorty, shorty_len, &soa, &args);
+ BuildQuickArgumentVisitor local_ref_visitor(
+ sp, /* is_static */ false, shorty, shorty_len, &soa, &args);
local_ref_visitor.VisitArguments();
DCHECK_GT(args.size(), 0U) << proxy_method->PrettyMethod();
@@ -982,6 +979,106 @@
return result.GetJ();
}
+// Visitor returning a reference argument at a given position in a Quick stack frame.
+// NOTE: Only used for testing purposes.
+class GetQuickReferenceArgumentAtVisitor FINAL : public QuickArgumentVisitor {
+ public:
+ GetQuickReferenceArgumentAtVisitor(ArtMethod** sp,
+ const char* shorty,
+ uint32_t shorty_len,
+ size_t arg_pos)
+ : QuickArgumentVisitor(sp, /* is_static */ false, shorty, shorty_len),
+ cur_pos_(0u),
+ arg_pos_(arg_pos),
+ ref_arg_(nullptr) {
+ CHECK_LT(arg_pos, shorty_len) << "Argument position greater than the number arguments";
+ }
+
+ void Visit() REQUIRES_SHARED(Locks::mutator_lock_) OVERRIDE {
+ if (cur_pos_ == arg_pos_) {
+ Primitive::Type type = GetParamPrimitiveType();
+ CHECK_EQ(type, Primitive::kPrimNot) << "Argument at searched position is not a reference";
+ ref_arg_ = reinterpret_cast<StackReference<mirror::Object>*>(GetParamAddress());
+ }
+ ++cur_pos_;
+ }
+
+ StackReference<mirror::Object>* GetReferenceArgument() {
+ return ref_arg_;
+ }
+
+ private:
+ // The position of the currently visited argument.
+ size_t cur_pos_;
+ // The position of the searched argument.
+ const size_t arg_pos_;
+ // The reference argument, if found.
+ StackReference<mirror::Object>* ref_arg_;
+
+ DISALLOW_COPY_AND_ASSIGN(GetQuickReferenceArgumentAtVisitor);
+};
+
+// Returning reference argument at position `arg_pos` in Quick stack frame at address `sp`.
+// NOTE: Only used for testing purposes.
+extern "C" StackReference<mirror::Object>* artQuickGetProxyReferenceArgumentAt(size_t arg_pos,
+ ArtMethod** sp)
+ REQUIRES_SHARED(Locks::mutator_lock_) {
+ ArtMethod* proxy_method = *sp;
+ ArtMethod* non_proxy_method = proxy_method->GetInterfaceMethodIfProxy(kRuntimePointerSize);
+ CHECK(!non_proxy_method->IsStatic())
+ << proxy_method->PrettyMethod() << " " << non_proxy_method->PrettyMethod();
+ uint32_t shorty_len = 0;
+ const char* shorty = non_proxy_method->GetShorty(&shorty_len);
+ GetQuickReferenceArgumentAtVisitor ref_arg_visitor(sp, shorty, shorty_len, arg_pos);
+ ref_arg_visitor.VisitArguments();
+ StackReference<mirror::Object>* ref_arg = ref_arg_visitor.GetReferenceArgument();
+ return ref_arg;
+}
+
+// Visitor returning all the reference arguments in a Quick stack frame.
+class GetQuickReferenceArgumentsVisitor FINAL : public QuickArgumentVisitor {
+ public:
+ GetQuickReferenceArgumentsVisitor(ArtMethod** sp,
+ bool is_static,
+ const char* shorty,
+ uint32_t shorty_len)
+ : QuickArgumentVisitor(sp, is_static, shorty, shorty_len) {}
+
+ void Visit() REQUIRES_SHARED(Locks::mutator_lock_) OVERRIDE {
+ Primitive::Type type = GetParamPrimitiveType();
+ if (type == Primitive::kPrimNot) {
+ StackReference<mirror::Object>* ref_arg =
+ reinterpret_cast<StackReference<mirror::Object>*>(GetParamAddress());
+ ref_args_.push_back(ref_arg);
+ }
+ }
+
+ std::vector<StackReference<mirror::Object>*> GetReferenceArguments() {
+ return ref_args_;
+ }
+
+ private:
+ // The reference arguments.
+ std::vector<StackReference<mirror::Object>*> ref_args_;
+
+ DISALLOW_COPY_AND_ASSIGN(GetQuickReferenceArgumentsVisitor);
+};
+
+// Returning all reference arguments in Quick stack frame at address `sp`.
+std::vector<StackReference<mirror::Object>*> GetProxyReferenceArguments(ArtMethod** sp)
+ REQUIRES_SHARED(Locks::mutator_lock_) {
+ ArtMethod* proxy_method = *sp;
+ ArtMethod* non_proxy_method = proxy_method->GetInterfaceMethodIfProxy(kRuntimePointerSize);
+ CHECK(!non_proxy_method->IsStatic())
+ << proxy_method->PrettyMethod() << " " << non_proxy_method->PrettyMethod();
+ uint32_t shorty_len = 0;
+ const char* shorty = non_proxy_method->GetShorty(&shorty_len);
+ GetQuickReferenceArgumentsVisitor ref_args_visitor(sp, /* is_static */ false, shorty, shorty_len);
+ ref_args_visitor.VisitArguments();
+ std::vector<StackReference<mirror::Object>*> ref_args = ref_args_visitor.GetReferenceArguments();
+ return ref_args;
+}
+
// Read object references held in arguments from quick frames and place in a JNI local references,
// so they don't get garbage collected.
class RememberForGcArgumentVisitor FINAL : public QuickArgumentVisitor {
diff --git a/runtime/thread.cc b/runtime/thread.cc
index 2ee7f9d..1de7b20 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -3436,7 +3436,7 @@
return object != nullptr && object->GetLockOwnerThreadId() == GetThreadId();
}
-extern "C" StackReference<mirror::Object>* artQuickGetProxyThisObjectReference(ArtMethod** sp)
+extern std::vector<StackReference<mirror::Object>*> GetProxyReferenceArguments(ArtMethod** sp)
REQUIRES_SHARED(Locks::mutator_lock_);
// RootVisitor parameters are: (const Object* obj, size_t vreg, const StackVisitor* visitor).
@@ -3482,7 +3482,7 @@
}
}
// Mark lock count map required for structured locking checks.
- shadow_frame->GetLockCountData().VisitMonitors(visitor_, -1, this);
+ shadow_frame->GetLockCountData().VisitMonitors(visitor_, /* vreg */ -1, this);
}
private:
@@ -3520,7 +3520,7 @@
}
}
mirror::Object* new_ref = klass.Ptr();
- visitor_(&new_ref, -1, this);
+ visitor_(&new_ref, /* vreg */ -1, this);
if (new_ref != klass) {
method->CASDeclaringClass(klass.Ptr(), new_ref->AsClass());
}
@@ -3583,17 +3583,20 @@
}
}
}
- } else if (!m->IsStatic() && !m->IsRuntimeMethod() && m->IsProxyMethod()) {
- // If this is a non-static proxy method, visit its target (`this` object).
+ } else if (!m->IsRuntimeMethod() && m->IsProxyMethod()) {
+ // If this is a proxy method, visit its reference arguments.
+ DCHECK(!m->IsStatic());
DCHECK(!m->IsNative());
- StackReference<mirror::Object>* ref_addr =
- artQuickGetProxyThisObjectReference(cur_quick_frame);
- mirror::Object* ref = ref_addr->AsMirrorPtr();
- if (ref != nullptr) {
- mirror::Object* new_ref = ref;
- visitor_(&new_ref, -1, this);
- if (ref != new_ref) {
- ref_addr->Assign(new_ref);
+ std::vector<StackReference<mirror::Object>*> ref_addrs =
+ GetProxyReferenceArguments(cur_quick_frame);
+ for (StackReference<mirror::Object>* ref_addr : ref_addrs) {
+ mirror::Object* ref = ref_addr->AsMirrorPtr();
+ if (ref != nullptr) {
+ mirror::Object* new_ref = ref;
+ visitor_(&new_ref, /* vreg */ -1, this);
+ if (ref != new_ref) {
+ ref_addr->Assign(new_ref);
+ }
}
}
}