summaryrefslogtreecommitdiffstats
path: root/runtime/reflection_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/reflection_test.cc')
-rw-r--r--runtime/reflection_test.cc34
1 files changed, 17 insertions, 17 deletions
diff --git a/runtime/reflection_test.cc b/runtime/reflection_test.cc
index 36e444a061..6f17e7d42c 100644
--- a/runtime/reflection_test.cc
+++ b/runtime/reflection_test.cc
@@ -20,8 +20,8 @@
#include <limits.h>
#include "ScopedLocalRef.h"
+#include "art_method-inl.h"
#include "common_compiler_test.h"
-#include "mirror/art_method-inl.h"
#include "scoped_thread_state_change.h"
namespace art {
@@ -81,7 +81,7 @@ class ReflectionTest : public CommonCompilerTest {
return soa.AddLocalReference<jclass>(c);
}
- void ReflectionTestMakeExecutable(mirror::ArtMethod** method,
+ void ReflectionTestMakeExecutable(ArtMethod** method,
mirror::Object** receiver,
bool is_static, const char* method_name,
const char* method_signature)
@@ -107,8 +107,8 @@ class ReflectionTest : public CommonCompilerTest {
class_loader);
CHECK(c != nullptr);
- *method = is_static ? c->FindDirectMethod(method_name, method_signature)
- : c->FindVirtualMethod(method_name, method_signature);
+ *method = is_static ? c->FindDirectMethod(method_name, method_signature, sizeof(void*))
+ : c->FindVirtualMethod(method_name, method_signature, sizeof(void*));
CHECK(method != nullptr);
if (is_static) {
@@ -130,7 +130,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeNopMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "nop", "()V");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -139,7 +139,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeIdentityByteMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "identity", "(B)B");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -164,7 +164,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeIdentityIntMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "identity", "(I)I");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -189,7 +189,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeIdentityDoubleMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "identity", "(D)D");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -214,7 +214,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumIntIntMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(II)I");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -243,7 +243,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumIntIntIntMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(III)I");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -282,7 +282,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumIntIntIntIntMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(IIII)I");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -326,7 +326,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumIntIntIntIntIntMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(IIIII)I");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -375,7 +375,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumDoubleDoubleMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(DD)D");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -409,7 +409,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumDoubleDoubleDoubleMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(DDD)D");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -436,7 +436,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumDoubleDoubleDoubleDoubleMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(DDDD)D");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -466,7 +466,7 @@ class ReflectionTest : public CommonCompilerTest {
void InvokeSumDoubleDoubleDoubleDoubleDoubleMethod(bool is_static) {
ScopedObjectAccess soa(env_);
- mirror::ArtMethod* method;
+ ArtMethod* method;
mirror::Object* receiver;
ReflectionTestMakeExecutable(&method, &receiver, is_static, "sum", "(DDDDD)D");
ScopedLocalRef<jobject> receiver_ref(soa.Env(), soa.AddLocalReference<jobject>(receiver));
@@ -515,7 +515,7 @@ TEST_F(ReflectionTest, StaticMainMethod) {
mirror::Class* klass = class_linker_->FindClass(soa.Self(), "LMain;", class_loader);
ASSERT_TRUE(klass != nullptr);
- mirror::ArtMethod* method = klass->FindDirectMethod("main", "([Ljava/lang/String;)V");
+ ArtMethod* method = klass->FindDirectMethod("main", "([Ljava/lang/String;)V", sizeof(void*));
ASSERT_TRUE(method != nullptr);
// Start runtime.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 02:24:18 +0000