commit e18fdd2f0e57873c22113975739139abe7418e09
author Ian Rogers <irogers@google.com> Fri Mar 14 13:29:43 2014 -0700
committer Ian Rogers <irogers@google.com> Fri Mar 14 13:29:43 2014 -0700
tree 0bb8bbe557a8090b90ae9dc8fe20f83ddd68c5a8
parent 0735a7eb23d430b3f7276294a3a436eddcf07b98

Work-around GCC polymorphism problems.

Change-Id: Ica1d8e6840cdd9ba493405e66c1728b5da9540a2

runtime/reflection.cc

diff --git a/runtime/reflection.cc b/runtime/reflection.cc
index 8e03429..dde9a94 100644
--- a/runtime/reflection.cc
+++ b/runtime/reflection.cc
@@ -99,7 +99,7 @@
     AppendWide(jv.j);
   }
 
-  void BuildArgArray(const ScopedObjectAccess& soa, mirror::Object* receiver, va_list ap)
+  void BuildArgArrayFromVarArgs(const ScopedObjectAccess& soa, mirror::Object* receiver, va_list ap)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     // Set receiver if non-null (method is not static)
     if (receiver != nullptr) {
@@ -134,8 +134,8 @@
     }
   }
 
-  void BuildArgArray(const ScopedObjectAccessUnchecked& soa, mirror::Object* receiver,
-                     jvalue* args)
+  void BuildArgArrayFromJValues(const ScopedObjectAccessUnchecked& soa, mirror::Object* receiver,
+                                jvalue* args)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     // Set receiver if non-null (method is not static)
     if (receiver != nullptr) {
@@ -216,8 +216,8 @@
                      PrettyDescriptor(found_descriptor.as_string()).c_str()).c_str());
   }
 
-  bool BuildArgArray(const ScopedObjectAccess& soa, mirror::Object* receiver,
-                     mirror::ObjectArray<mirror::Object>* args, MethodHelper& mh)
+  bool BuildArgArrayFromObjectArray(const ScopedObjectAccess& soa, mirror::Object* receiver,
+                                    mirror::ObjectArray<mirror::Object>* args, MethodHelper& mh)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     const DexFile::TypeList* classes = mh.GetParameterTypeList();
     // Set receiver if non-null (method is not static)
@@ -413,7 +413,7 @@
   MethodHelper mh(method);
   JValue result;
   ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength());
-  arg_array.BuildArgArray(soa, receiver, args);
+  arg_array.BuildArgArrayFromVarArgs(soa, receiver, args);
   InvokeWithArgArray(soa, method, &arg_array, &result, mh.GetShorty());
   return result;
 }
@@ -424,7 +424,7 @@
   MethodHelper mh(method);
   JValue result;
   ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength());
-  arg_array.BuildArgArray(soa, receiver, args);
+  arg_array.BuildArgArrayFromJValues(soa, receiver, args);
   InvokeWithArgArray(soa, method, &arg_array, &result, mh.GetShorty());
   return result;
 }
@@ -435,7 +435,7 @@
   MethodHelper mh(method);
   JValue result;
   ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength());
-  arg_array.BuildArgArray(soa, receiver, args);
+  arg_array.BuildArgArrayFromJValues(soa, receiver, args);
   InvokeWithArgArray(soa, method, &arg_array, &result, mh.GetShorty());
   return result;
 }
@@ -447,7 +447,7 @@
   MethodHelper mh(method);
   JValue result;
   ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength());
-  arg_array.BuildArgArray(soa, receiver, args);
+  arg_array.BuildArgArrayFromVarArgs(soa, receiver, args);
   InvokeWithArgArray(soa, method, &arg_array, &result, mh.GetShorty());
   return result;
 }
@@ -503,7 +503,7 @@
   // Invoke the method.
   JValue result;
   ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength());
-  if (!arg_array.BuildArgArray(soa, receiver, objects, mh)) {
+  if (!arg_array.BuildArgArrayFromObjectArray(soa, receiver, objects, mh)) {
     CHECK(soa.Self()->IsExceptionPending());
     return nullptr;
   }