diff options
| author | 2015-03-09 10:15:14 +0000 | |
|---|---|---|
| committer | 2015-03-09 10:15:14 +0000 | |
| commit | a60bb12ed88a0f11fb6a8444964ea55af2054824 (patch) | |
| tree | 8eabb49a208c04b219e5a1b037254647498d9d1d /runtime/arch/stub_test.cc | |
| parent | f20cc35c8e37a515fc19ca554b56ee78dfa7cc82 (diff) | |
| parent | 5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b (diff) | |
am 5c9d8f0d: Merge "Compute the right catch location for the debugger."
* commit '5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b':
Compute the right catch location for the debugger.
Diffstat (limited to 'runtime/arch/stub_test.cc')
| -rw-r--r-- | runtime/arch/stub_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc index 0d41a8fd29..0769687716 100644 --- a/runtime/arch/stub_test.cc +++ b/runtime/arch/stub_test.cc @@ -1171,7 +1171,7 @@ TEST_F(StubTest, AllocObjectArray) { reinterpret_cast<size_t>(nullptr), StubTest::GetEntrypoint(self, kQuickAllocArrayResolved), self); - EXPECT_FALSE(self->IsExceptionPending()) << PrettyTypeOf(self->GetException(nullptr)); + EXPECT_FALSE(self->IsExceptionPending()) << PrettyTypeOf(self->GetException()); EXPECT_NE(reinterpret_cast<size_t>(nullptr), result); mirror::Object* obj = reinterpret_cast<mirror::Object*>(result); EXPECT_TRUE(obj->IsArrayInstance()); @@ -2060,7 +2060,7 @@ TEST_F(StubTest, IMT) { env->CallBooleanMethod(jarray_list, add_jmethod, jobj); - ASSERT_FALSE(self->IsExceptionPending()) << PrettyTypeOf(self->GetException(nullptr)); + ASSERT_FALSE(self->IsExceptionPending()) << PrettyTypeOf(self->GetException()); // Contains. |