AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert r22597 (which should have been called: "Tests that the GC doesn't mistake non-pointer constant pool entries as poitners.")

Browse Source 
TBR=yangguo@chromium.org

Review URL: https://codereview.chromium.org/413173002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22598 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
rmcilroy@chromium.org 2014-07-24 12:30:53 +00:00
parent 48f44b65ee
commit 7cd5dbb9fa
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/objects-inl.h
View File

@ -2539,7 +2539,6 @@ void ConstantPoolArray::set(int index, Address value) {
void ConstantPoolArray::set(int index, Object* value) {
ASSERT(map() == GetHeap()->constant_pool_array_map());
ASSERT(!GetHeap()->InNewSpace(value));
ASSERT(get_type(index) == HEAP_PTR);
WRITE_FIELD(this, OffsetOfElementAt(index), value);
WRITE_BARRIER(GetHeap(), this, OffsetOfElementAt(index), value);
@ -2584,7 +2583,6 @@ void ConstantPoolArray::set_at_offset(int offset, Address value) {
void ConstantPoolArray::set_at_offset(int offset, Object* value) {
ASSERT(map() == GetHeap()->constant_pool_array_map());
ASSERT(!GetHeap()->InNewSpace(value));
ASSERT(offset_is_type(offset, HEAP_PTR));
WRITE_FIELD(this, offset, value);
WRITE_BARRIER(GetHeap(), this, offset, value);

36
test/cctest/test-constantpool.cc
View File

@ -242,39 +242,3 @@ TEST(ConstantPoolIteratorExtended) {
int expected_int32_indexs[] = { 1, 2, 3, 4 };
CheckIterator(array, ConstantPoolArray::INT32, expected_int32_indexs, 4);
}
TEST(ConstantPoolPreciseGC) {
LocalContext context;
Isolate* isolate = CcTest::i_isolate();
Heap* heap = isolate->heap();
Factory* factory = isolate->factory();
v8::HandleScope scope(context->GetIsolate());
ConstantPoolArray::NumberOfEntries small(1, 0, 0, 1);
Handle<ConstantPoolArray> array = factory->NewConstantPoolArray(small);
// Check that the store buffer knows which entries are pointers and which are
// not. To do this, make non-pointer entries which look like new space
// pointers but are actually invalid and ensure the GC doesn't try to move
// them.
Handle<HeapObject> object = factory->NewHeapNumber(4.0);
Object* raw_ptr = *object;
// If interpreted as a pointer, this should be right inside the heap number
// which will cause a crash when trying to lookup the 'map' pointer.
int32_t invalid_ptr_int32 = reinterpret_cast<int32_t>(raw_ptr) + kInt32Size;
int64_t invalid_ptr_int64 = reinterpret_cast<int64_t>(raw_ptr) + kInt32Size;
array->set(0, invalid_ptr_int64);
array->set(1, invalid_ptr_int32);
// Ensure we perform a scan on scavenge for the constant pool's page.
MemoryChunk::FromAddress(array->address())->set_scan_on_scavenge(true);
heap->CollectGarbage(NEW_SPACE);
// Check the object was moved by GC.
CHECK_NE(*object, raw_ptr);
// Check the non-pointer entries weren't changed.
CHECK_EQ(invalid_ptr_int64, array->get_int64_entry(0));
CHECK_EQ(invalid_ptr_int32, array->get_int32_entry(1));
}