Reviewers: Jakob,
Message:
PTAL
Description:
Fix build and test failures from packed array optimizations.
[email protected]
Please review this at http://codereview.chromium.org/10332317/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/x64/macro-assembler-x64.cc
M test/mjsunit/unbox-double-arrays.js
Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index
6308fa323532fca430c022948bc31bbbfedb8f5c..95b43f42a40c652c98ddfd511efb02f75c94a80f
100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -4059,7 +4059,7 @@ void
MacroAssembler::LoadTransitionedArrayMapConditional(
movq(scratch, Operand(scratch,
Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX)));
- size_t offset = expected_kind * kPointerSize +
+ int offset = expected_kind * kPointerSize +
FixedArrayBase::kHeaderSize;
cmpq(map_in_out, FieldOperand(scratch, offset));
j(not_equal, no_map_match);
Index: test/mjsunit/unbox-double-arrays.js
diff --git a/test/mjsunit/unbox-double-arrays.js
b/test/mjsunit/unbox-double-arrays.js
index
d5f78167f8d02270e5ec30a3327030605f670028..ac039930c323e4d2a11bdefd02be47468b504f8a
100644
--- a/test/mjsunit/unbox-double-arrays.js
+++ b/test/mjsunit/unbox-double-arrays.js
@@ -278,7 +278,8 @@ function testOneArrayType(allocator) {
expected_array_value(7));
%DeoptimizeFunction(test_various_loads6);
- gc();
+ %ClearFunctionTypeFeedback(test_various_stores);
+ %ClearFunctionTypeFeedback(test_various_loads7);
// Test stores for non-NaN.
var large_array = new allocator(large_array_size);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
