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

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

Issue 10038010: Fix regular and ElementsKind transitions interfering with each other (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 8 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/stub-cache-mips.cc ('k') | test/mjsunit/regress/regress-crbug-122271.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 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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 // but may be destroyed if store is successful. 723 // but may be destroyed if store is successful.
724 void StubCompiler::GenerateStoreField(MacroAssembler* masm, 724 void StubCompiler::GenerateStoreField(MacroAssembler* masm,
725 Handle<JSObject> object, 725 Handle<JSObject> object,
726 int index, 726 int index,
727 Handle<Map> transition, 727 Handle<Map> transition,
728 Register receiver_reg, 728 Register receiver_reg,
729 Register name_reg, 729 Register name_reg,
730 Register scratch, 730 Register scratch,
731 Label* miss_label) { 731 Label* miss_label) {
732 // Check that the map of the object hasn't changed. 732 // Check that the map of the object hasn't changed.
733 CompareMapMode mode = transition.is_null() ? ALLOW_ELEMENT_TRANSITION_MAPS
734 : REQUIRE_EXACT_MAP;
733 __ CheckMap(receiver_reg, Handle<Map>(object->map()), 735 __ CheckMap(receiver_reg, Handle<Map>(object->map()),
734 miss_label, DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS); 736 miss_label, DO_SMI_CHECK, mode);
735 737
736 // Perform global security token check if needed. 738 // Perform global security token check if needed.
737 if (object->IsJSGlobalProxy()) { 739 if (object->IsJSGlobalProxy()) {
738 __ CheckAccessGlobalProxy(receiver_reg, scratch, miss_label); 740 __ CheckAccessGlobalProxy(receiver_reg, scratch, miss_label);
739 } 741 }
740 742
741 // Stub never generated for non-global objects that require access 743 // Stub never generated for non-global objects that require access
742 // checks. 744 // checks.
743 ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded()); 745 ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded());
744 746
(...skipping 3067 matching lines...) Expand 10 before | Expand all | Expand 10 after
3812 __ jmp(ic_slow, RelocInfo::CODE_TARGET); 3814 __ jmp(ic_slow, RelocInfo::CODE_TARGET);
3813 } 3815 }
3814 } 3816 }
3815 3817
3816 3818
3817 #undef __ 3819 #undef __
3818 3820
3819 } } // namespace v8::internal 3821 } } // namespace v8::internal
3820 3822
3821 #endif // V8_TARGET_ARCH_X64 3823 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/mips/stub-cache-mips.cc ('k') | test/mjsunit/regress/regress-crbug-122271.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698