Index: test/cctest/test-heap.cc |
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc |
index ac121e059fe9a313e921d656918281da96d105eb..1be2520f51a80fe6bbe85ddb1fb9d6b323941e1b 100644 |
--- a/test/cctest/test-heap.cc |
+++ b/test/cctest/test-heap.cc |
@@ -2384,12 +2384,17 @@ TEST(OptimizedPretenuringMixedInObjectProperties) { |
FieldIndex idx1 = FieldIndex::ForPropertyIndex(o->map(), 0); |
FieldIndex idx2 = FieldIndex::ForPropertyIndex(o->map(), 1); |
CHECK(CcTest::heap()->InOldPointerSpace(o->RawFastPropertyAt(idx1))); |
- CHECK(CcTest::heap()->InOldDataSpace(o->RawFastPropertyAt(idx2))); |
+ if (!FLAG_unbox_double_fields) { |
+ CHECK(CcTest::heap()->InOldDataSpace(o->RawFastPropertyAt(idx2))); |
+ } |
Hannes Payer (out of office)
2014/11/06 12:29:46
Can we check the else case here, that we have a do
Igor Sheludko
2014/11/07 08:03:53
Done.
|
JSObject* inner_object = |
reinterpret_cast<JSObject*>(o->RawFastPropertyAt(idx1)); |
CHECK(CcTest::heap()->InOldPointerSpace(inner_object)); |
- CHECK(CcTest::heap()->InOldDataSpace(inner_object->RawFastPropertyAt(idx1))); |
+ if (!FLAG_unbox_double_fields) { |
+ CHECK( |
+ CcTest::heap()->InOldDataSpace(inner_object->RawFastPropertyAt(idx1))); |
+ } |
Hannes Payer (out of office)
2014/11/06 12:29:46
Same here.
Igor Sheludko
2014/11/07 08:03:53
Done.
|
CHECK(CcTest::heap()->InOldPointerSpace( |
inner_object->RawFastPropertyAt(idx2))); |
} |