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

Side by Side Diff: src/ia32/stub-cache-ia32.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 | « src/arm/stub-cache-arm.cc ('k') | src/x64/stub-cache-x64.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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 924
925 // Update the write barrier for the map field. 925 // Update the write barrier for the map field.
926 __ RecordWriteField(receiver_reg, 926 __ RecordWriteField(receiver_reg,
927 HeapObject::kMapOffset, 927 HeapObject::kMapOffset,
928 scratch1, 928 scratch1,
929 scratch2, 929 scratch2,
930 kDontSaveFPRegs, 930 kDontSaveFPRegs,
931 OMIT_REMEMBERED_SET, 931 OMIT_REMEMBERED_SET,
932 OMIT_SMI_CHECK); 932 OMIT_SMI_CHECK);
933 933
934 if (details.type() == CONSTANT_FUNCTION) return; 934 if (details.type() == CONSTANT_FUNCTION) {
935 ASSERT(value_reg.is(eax));
936 __ ret(0);
937 return;
938 }
935 939
936 int index = transition->instance_descriptors()->GetFieldIndex( 940 int index = transition->instance_descriptors()->GetFieldIndex(
937 transition->LastAdded()); 941 transition->LastAdded());
938 942
939 // Adjust for the number of properties stored in the object. Even in the 943 // Adjust for the number of properties stored in the object. Even in the
940 // face of a transition we can use the old map here because the size of the 944 // face of a transition we can use the old map here because the size of the
941 // object and the number of in-object properties is not going to change. 945 // object and the number of in-object properties is not going to change.
942 index -= object->map()->inobject_properties(); 946 index -= object->map()->inobject_properties();
943 947
944 SmiCheck smi_check = representation.IsTagged() 948 SmiCheck smi_check = representation.IsTagged()
(...skipping 2826 matching lines...) Expand 10 before | Expand all | Expand 10 after
3771 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow); 3775 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow);
3772 } 3776 }
3773 } 3777 }
3774 3778
3775 3779
3776 #undef __ 3780 #undef __
3777 3781
3778 } } // namespace v8::internal 3782 } } // namespace v8::internal
3779 3783
3780 #endif // V8_TARGET_ARCH_IA32 3784 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/arm/stub-cache-arm.cc ('k') | src/x64/stub-cache-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698