Index: src/objects.cc |
=================================================================== |
--- src/objects.cc (revision 10127) |
+++ src/objects.cc (working copy) |
@@ -1640,8 +1640,6 @@ |
String* name, |
JSFunction* function, |
PropertyAttributes attributes) { |
- ASSERT(!GetHeap()->InNewSpace(function)); |
- |
// Allocate new instance descriptors with (name, function) added |
ConstantFunctionDescriptor d(name, function, attributes); |
Object* new_descriptors; |
@@ -1756,7 +1754,7 @@ |
// Ensure the descriptor array does not get too big. |
if (map_of_this->instance_descriptors()->number_of_descriptors() < |
DescriptorArray::kMaxNumberOfDescriptors) { |
- if (value->IsJSFunction() && !heap->InNewSpace(value)) { |
+ if (value->IsJSFunction()) { |
return AddConstantFunctionProperty(name, |
JSFunction::cast(value), |
attributes); |
@@ -2995,7 +2993,6 @@ |
ASSERT(target_descriptors->GetType(number) == CONSTANT_FUNCTION); |
JSFunction* function = |
JSFunction::cast(target_descriptors->GetValue(number)); |
- ASSERT(!HEAP->InNewSpace(function)); |
if (value == function) { |
set_map(target_map); |
return value; |
@@ -5635,7 +5632,7 @@ |
} |
} |
if (child_hash <= parent_hash) break; |
- NoWriteBarrierSwapDescriptors(parent_index, child_index); |
+ NoIncrementalWriteBarrierSwapDescriptors(parent_index, child_index); |
// Now element at child_index could be < its children. |
parent_index = child_index; // parent_hash remains correct. |
} |
@@ -5644,7 +5641,7 @@ |
// Extract elements and create sorted array. |
for (int i = len - 1; i > 0; --i) { |
// Put max element at the back of the array. |
- NoWriteBarrierSwapDescriptors(0, i); |
+ NoIncrementalWriteBarrierSwapDescriptors(0, i); |
// Shift down the new top element. |
int parent_index = 0; |
const uint32_t parent_hash = GetKey(parent_index)->Hash(); |
@@ -5660,7 +5657,7 @@ |
} |
} |
if (child_hash <= parent_hash) break; |
- NoWriteBarrierSwapDescriptors(parent_index, child_index); |
+ NoIncrementalWriteBarrierSwapDescriptors(parent_index, child_index); |
parent_index = child_index; |
} |
} |