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

Side by Side Diff: src/x64/stub-cache-x64.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/ia32/stub-cache-ia32.cc ('k') | no next file » | 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 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 882
883 // Update the write barrier for the map field. 883 // Update the write barrier for the map field.
884 __ RecordWriteField(receiver_reg, 884 __ RecordWriteField(receiver_reg,
885 HeapObject::kMapOffset, 885 HeapObject::kMapOffset,
886 scratch1, 886 scratch1,
887 scratch2, 887 scratch2,
888 kDontSaveFPRegs, 888 kDontSaveFPRegs,
889 OMIT_REMEMBERED_SET, 889 OMIT_REMEMBERED_SET,
890 OMIT_SMI_CHECK); 890 OMIT_SMI_CHECK);
891 891
892 if (details.type() == CONSTANT_FUNCTION) return; 892 if (details.type() == CONSTANT_FUNCTION) {
893 ASSERT(value_reg.is(rax));
894 __ ret(0);
895 return;
896 }
893 897
894 int index = transition->instance_descriptors()->GetFieldIndex( 898 int index = transition->instance_descriptors()->GetFieldIndex(
895 transition->LastAdded()); 899 transition->LastAdded());
896 900
897 // Adjust for the number of properties stored in the object. Even in the 901 // Adjust for the number of properties stored in the object. Even in the
898 // face of a transition we can use the old map here because the size of the 902 // face of a transition we can use the old map here because the size of the
899 // object and the number of in-object properties is not going to change. 903 // object and the number of in-object properties is not going to change.
900 index -= object->map()->inobject_properties(); 904 index -= object->map()->inobject_properties();
901 905
902 // TODO(verwaest): Share this code as a code stub. 906 // TODO(verwaest): Share this code as a code stub.
(...skipping 2610 matching lines...) Expand 10 before | Expand all | Expand 10 after
3513 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow); 3517 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow);
3514 } 3518 }
3515 } 3519 }
3516 3520
3517 3521
3518 #undef __ 3522 #undef __
3519 3523
3520 } } // namespace v8::internal 3524 } } // namespace v8::internal
3521 3525
3522 #endif // V8_TARGET_ARCH_X64 3526 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/ia32/stub-cache-ia32.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698