diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-02-08 16:20:58 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-02-08 16:26:12 -0800 |
| commit | 5bb99037bef70784ae4630c2e4b81688d2a18621 (patch) | |
| tree | 7c01146719c9bd445f983d470980206952d8719b /runtime/mirror/object_test.cc | |
| parent | 9c7f35435b51cdeae8665aabb8e63392105db787 (diff) | |
| download | art-5bb99037bef70784ae4630c2e4b81688d2a18621.zip art-5bb99037bef70784ae4630c2e4b81688d2a18621.tar.gz art-5bb99037bef70784ae4630c2e4b81688d2a18621.tar.bz2 | |
Fix CreateMultiArray to be compaction safe.
It used to be compaction safe before moving classes was enabled.
Added missing SIRTs.
Change-Id: I92963ed71fa6d2a20d16ec0e400b8fa0e41ac196
Diffstat (limited to 'runtime/mirror/object_test.cc')
| -rw-r--r-- | runtime/mirror/object_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc index 2af32da..db9723b 100644 --- a/runtime/mirror/object_test.cc +++ b/runtime/mirror/object_test.cc @@ -236,12 +236,12 @@ TEST_F(ObjectTest, CreateMultiArray) { SirtRef<Class> c(soa.Self(), class_linker_->FindSystemClass("I")); SirtRef<IntArray> dims(soa.Self(), IntArray::Alloc(soa.Self(), 1)); dims->Set(0, 1); - Array* multi = Array::CreateMultiArray(soa.Self(), c.get(), dims.get()); + Array* multi = Array::CreateMultiArray(soa.Self(), c, dims); EXPECT_TRUE(multi->GetClass() == class_linker_->FindSystemClass("[I")); EXPECT_EQ(1, multi->GetLength()); dims->Set(0, -1); - multi = Array::CreateMultiArray(soa.Self(), c.get(), dims.get()); + multi = Array::CreateMultiArray(soa.Self(), c, dims); EXPECT_TRUE(soa.Self()->IsExceptionPending()); EXPECT_EQ(PrettyDescriptor(soa.Self()->GetException(NULL)->GetClass()), "java.lang.NegativeArraySizeException"); @@ -252,7 +252,7 @@ TEST_F(ObjectTest, CreateMultiArray) { for (int j = 0; j < 20; ++j) { dims->Set(0, i); dims->Set(1, j); - multi = Array::CreateMultiArray(soa.Self(), c.get(), dims.get()); + multi = Array::CreateMultiArray(soa.Self(), c, dims); EXPECT_TRUE(multi->GetClass() == class_linker_->FindSystemClass("[[I")); EXPECT_EQ(i, multi->GetLength()); for (int k = 0; k < i; ++k) { |