Commit 6cabd635 authored by antonm@chromium.org's avatar antonm@chromium.org

Temporary backing out r3538 to see impact on DOM benchmarks.



git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3586 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 1aeb239e
...@@ -6878,7 +6878,7 @@ Object* HashTable<Shape, Key>::EnsureCapacity(int n, Key key) { ...@@ -6878,7 +6878,7 @@ Object* HashTable<Shape, Key>::EnsureCapacity(int n, Key key) {
// 50% is still free after adding n elements and // 50% is still free after adding n elements and
// at most 50% of the free elements are deleted elements. // at most 50% of the free elements are deleted elements.
if ((nof + (nof >> 1) <= capacity) && if ((nof + (nof >> 1) <= capacity) &&
(nod <= (capacity - nof) >> 1)) return this; (nod <= (capacity - nof) >> 1) ) return this;
Object* obj = Allocate(nof * 2); Object* obj = Allocate(nof * 2);
if (obj->IsFailure()) return obj; if (obj->IsFailure()) return obj;
......
...@@ -5416,8 +5416,6 @@ class ArrayConcatVisitor { ...@@ -5416,8 +5416,6 @@ class ArrayConcatVisitor {
} }
} }
Handle<FixedArray> storage() { return storage_; }
private: private:
Handle<FixedArray> storage_; Handle<FixedArray> storage_;
// Limit on the accepted indices. Elements with indices larger than the // Limit on the accepted indices. Elements with indices larger than the
...@@ -5758,8 +5756,7 @@ static Object* Runtime_ArrayConcat(Arguments args) { ...@@ -5758,8 +5756,7 @@ static Object* Runtime_ArrayConcat(Arguments args) {
IterateArguments(arguments, &visitor); IterateArguments(arguments, &visitor);
result->set_length(*len); result->set_length(*len);
// Please note the storage might have changed in the visitor. result->set_elements(*storage);
result->set_elements(*visitor.storage());
return *result; return *result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment