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

Side by Side Diff: src/arm/stub-cache-arm.cc

Issue 17250003: Fix constant function transition. Insert return instruction before returning. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 6 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 | « no previous file | src/ia32/stub-cache-ia32.cc » ('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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 // name_reg as scratch register. 570 // name_reg as scratch register.
571 __ RecordWriteField(receiver_reg, 571 __ RecordWriteField(receiver_reg,
572 HeapObject::kMapOffset, 572 HeapObject::kMapOffset,
573 scratch1, 573 scratch1,
574 scratch2, 574 scratch2,
575 kLRHasNotBeenSaved, 575 kLRHasNotBeenSaved,
576 kDontSaveFPRegs, 576 kDontSaveFPRegs,
577 OMIT_REMEMBERED_SET, 577 OMIT_REMEMBERED_SET,
578 OMIT_SMI_CHECK); 578 OMIT_SMI_CHECK);
579 579
580 if (details.type() == CONSTANT_FUNCTION) return; 580 if (details.type() == CONSTANT_FUNCTION) {
581 ASSERT(value_reg.is(r0));
582 __ Ret();
583 return;
584 }
581 585
582 int index = transition->instance_descriptors()->GetFieldIndex( 586 int index = transition->instance_descriptors()->GetFieldIndex(
583 transition->LastAdded()); 587 transition->LastAdded());
584 588
585 // Adjust for the number of properties stored in the object. Even in the 589 // Adjust for the number of properties stored in the object. Even in the
586 // face of a transition we can use the old map here because the size of the 590 // face of a transition we can use the old map here because the size of the
587 // object and the number of in-object properties is not going to change. 591 // object and the number of in-object properties is not going to change.
588 index -= object->map()->inobject_properties(); 592 index -= object->map()->inobject_properties();
589 593
590 // TODO(verwaest): Share this code as a code stub. 594 // TODO(verwaest): Share this code as a code stub.
(...skipping 3083 matching lines...) Expand 10 before | Expand all | Expand 10 after
3674 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow); 3678 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow);
3675 } 3679 }
3676 } 3680 }
3677 3681
3678 3682
3679 #undef __ 3683 #undef __
3680 3684
3681 } } // namespace v8::internal 3685 } } // namespace v8::internal
3682 3686
3683 #endif // V8_TARGET_ARCH_ARM 3687 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/stub-cache-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698