commit 2c0caed9e0b39bd934e469da84e86a63b1148412
author Ryan Prichard <rprichard@google.com> Thu Jul 27 00:26:46 2023 -0700
committer David Srbecky <dsrbecky@google.com> Fri Jul 28 12:46:16 2023 +0000
tree 68cb53a8fcf7bc5a23296d76ce36c2a4de403b27
parent 771134ce6e8120c302c3656b8d57b1cc88cdd794

InvokeStatic: pass (nullptr, 0) when there are no args

Previously, the behavior depended on how the STL implemented a
std::array of zero length. libc++'s behavior changed in D80821 from a
non-null data() to a null data().

In InvokeInstance, vregs will always have at least the receiver, so
data() will never be null.

Bug: b/293402944
Test: treehugger
Change-Id: Ibd2c772baa14993b2fbdd2abdb6b58621dca0c5c

runtime/art_method-inl.h

diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 7353b14..e79e5a4 100644
--- a/runtime/art_method-inl.h
+++ b/runtime/art_method-inl.h
@@ -184,7 +184,11 @@
   JValue result;
   constexpr auto shorty = detail::MaterializeShorty<ReturnType, ArgType...>();
   auto vregs = detail::MaterializeVRegs<ArgType...>(args...);
-  Invoke(self, vregs.data(), sizeof(vregs), &result, shorty.data());
+  Invoke(self,
+         vregs.empty() ? nullptr : vregs.data(),
+         vregs.size() * sizeof(typename decltype(vregs)::value_type),
+         &result,
+         shorty.data());
   return detail::ShortyTraits<ReturnType>::Get(result);
 }
 
@@ -198,7 +202,11 @@
   JValue result;
   constexpr auto shorty = detail::MaterializeShorty<ReturnType, ArgType...>();
   auto vregs = detail::MaterializeVRegs<'L', ArgType...>(receiver, args...);
-  Invoke(self, vregs.data(), sizeof(vregs), &result, shorty.data());
+  Invoke(self,
+         vregs.data(),
+         vregs.size() * sizeof(typename decltype(vregs)::value_type),
+         &result,
+         shorty.data());
   return detail::ShortyTraits<ReturnType>::Get(result);
 }