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

Side by Side Diff: src/arm/lithium-codegen-arm.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/a64/lithium-codegen-a64.cc ('k') | src/code-stubs.h » ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 4341 matching lines...) Expand 10 before | Expand all | Expand 10 after
4352 __ str(new_map_reg, FieldMemOperand(object_reg, HeapObject::kMapOffset)); 4352 __ str(new_map_reg, FieldMemOperand(object_reg, HeapObject::kMapOffset));
4353 // Write barrier. 4353 // Write barrier.
4354 __ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg, 4354 __ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg,
4355 scratch, GetLinkRegisterState(), kDontSaveFPRegs); 4355 scratch, GetLinkRegisterState(), kDontSaveFPRegs);
4356 } else { 4356 } else {
4357 ASSERT(ToRegister(instr->context()).is(cp)); 4357 ASSERT(ToRegister(instr->context()).is(cp));
4358 PushSafepointRegistersScope scope( 4358 PushSafepointRegistersScope scope(
4359 this, Safepoint::kWithRegistersAndDoubles); 4359 this, Safepoint::kWithRegistersAndDoubles);
4360 __ Move(r0, object_reg); 4360 __ Move(r0, object_reg);
4361 __ Move(r1, to_map); 4361 __ Move(r1, to_map);
4362 TransitionElementsKindStub stub(from_kind, to_kind); 4362 bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
4363 TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
4363 __ CallStub(&stub); 4364 __ CallStub(&stub);
4364 RecordSafepointWithRegistersAndDoubles( 4365 RecordSafepointWithRegistersAndDoubles(
4365 instr->pointer_map(), 0, Safepoint::kNoLazyDeopt); 4366 instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
4366 } 4367 }
4367 __ bind(&not_applicable); 4368 __ bind(&not_applicable);
4368 } 4369 }
4369 4370
4370 4371
4371 void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) { 4372 void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) {
4372 Register object = ToRegister(instr->object()); 4373 Register object = ToRegister(instr->object());
(...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
5714 __ sub(scratch, result, Operand::PointerOffsetFromSmiKey(index)); 5715 __ sub(scratch, result, Operand::PointerOffsetFromSmiKey(index));
5715 __ ldr(result, FieldMemOperand(scratch, 5716 __ ldr(result, FieldMemOperand(scratch,
5716 FixedArray::kHeaderSize - kPointerSize)); 5717 FixedArray::kHeaderSize - kPointerSize));
5717 __ bind(&done); 5718 __ bind(&done);
5718 } 5719 }
5719 5720
5720 5721
5721 #undef __ 5722 #undef __
5722 5723
5723 } } // namespace v8::internal 5724 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/a64/lithium-codegen-a64.cc ('k') | src/code-stubs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698