diff options
Diffstat (limited to 'runtime/interpreter/unstarted_runtime_test.cc')
| -rw-r--r-- | runtime/interpreter/unstarted_runtime_test.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc index 4429f6371d..8020962c52 100644 --- a/runtime/interpreter/unstarted_runtime_test.cc +++ b/runtime/interpreter/unstarted_runtime_test.cc @@ -1322,19 +1322,13 @@ TEST_F(UnstartedRuntimeTest, ConstructorNewInstance0) { Handle<mirror::String> input = hs.NewHandle(mirror::String::AllocFromModifiedUtf8(self, "abd")); // Find the constructor. - ArtMethod* throw_cons = throw_class->FindConstructor( - "(Ljava/lang/String;)V", class_linker->GetImagePointerSize()); + PointerSize pointer_size = class_linker->GetImagePointerSize(); + ArtMethod* throw_cons = throw_class->FindConstructor("(Ljava/lang/String;)V", pointer_size); ASSERT_TRUE(throw_cons != nullptr); - Handle<mirror::Constructor> cons; - if (class_linker->GetImagePointerSize() == PointerSize::k64) { - cons = hs.NewHandle( - mirror::Constructor::CreateFromArtMethod<PointerSize::k64, false>(self, throw_cons)); - ASSERT_TRUE(cons != nullptr); - } else { - cons = hs.NewHandle( - mirror::Constructor::CreateFromArtMethod<PointerSize::k32, false>(self, throw_cons)); - ASSERT_TRUE(cons != nullptr); - } + Handle<mirror::Constructor> cons = hs.NewHandle((pointer_size == PointerSize::k64) + ? mirror::Constructor::CreateFromArtMethod<PointerSize::k64>(self, throw_cons) + : mirror::Constructor::CreateFromArtMethod<PointerSize::k32>(self, throw_cons)); + ASSERT_TRUE(cons != nullptr); Handle<mirror::ObjectArray<mirror::Object>> args = hs.NewHandle( mirror::ObjectArray<mirror::Object>::Alloc( |