Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: src/x64/lithium-codegen-x64.cc

Issue 196343023: Fix TransitionElementsKindStub to handle non-JSArray objects correctly. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Fix flag Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/mips/lithium-codegen-mips.cc ('k') | test/mjsunit/regress/regress-352982.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 4355 matching lines...) Expand 10 before | Expand all | Expand 10 after
4366 ASSERT_NE(instr->temp(), NULL); 4366 ASSERT_NE(instr->temp(), NULL);
4367 __ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg, 4367 __ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg,
4368 ToRegister(instr->temp()), kDontSaveFPRegs); 4368 ToRegister(instr->temp()), kDontSaveFPRegs);
4369 } else { 4369 } else {
4370 ASSERT(ToRegister(instr->context()).is(rsi)); 4370 ASSERT(ToRegister(instr->context()).is(rsi));
4371 PushSafepointRegistersScope scope(this); 4371 PushSafepointRegistersScope scope(this);
4372 if (!object_reg.is(rax)) { 4372 if (!object_reg.is(rax)) {
4373 __ movp(rax, object_reg); 4373 __ movp(rax, object_reg);
4374 } 4374 }
4375 __ Move(rbx, to_map); 4375 __ Move(rbx, to_map);
4376 TransitionElementsKindStub stub(from_kind, to_kind); 4376 bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
4377 TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
4377 __ CallStub(&stub); 4378 __ CallStub(&stub);
4378 RecordSafepointWithRegisters( 4379 RecordSafepointWithRegisters(
4379 instr->pointer_map(), 0, Safepoint::kNoLazyDeopt); 4380 instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
4380 } 4381 }
4381 __ bind(&not_applicable); 4382 __ bind(&not_applicable);
4382 } 4383 }
4383 4384
4384 4385
4385 void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) { 4386 void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) {
4386 Register object = ToRegister(instr->object()); 4387 Register object = ToRegister(instr->object());
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
5642 FixedArray::kHeaderSize - kPointerSize)); 5643 FixedArray::kHeaderSize - kPointerSize));
5643 __ bind(&done); 5644 __ bind(&done);
5644 } 5645 }
5645 5646
5646 5647
5647 #undef __ 5648 #undef __
5648 5649
5649 } } // namespace v8::internal 5650 } } // namespace v8::internal
5650 5651
5651 #endif // V8_TARGET_ARCH_X64 5652 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/mips/lithium-codegen-mips.cc ('k') | test/mjsunit/regress/regress-352982.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698