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

Side by Side Diff: src/accessors.cc

Issue 6116001: Use a separate marker value to allocate the arguments object on deoptimzation... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 11 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/arm/codegen-arm.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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 757 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 if (i > 0) { 768 if (i > 0) {
769 // Function in question was inlined. 769 // Function in question was inlined.
770 return ConstructArgumentsObjectForInlinedFunction(frame, function, i); 770 return ConstructArgumentsObjectForInlinedFunction(frame, function, i);
771 } else { 771 } else {
772 // If there is an arguments variable in the stack, we return that. 772 // If there is an arguments variable in the stack, we return that.
773 int index = function->shared()->scope_info()-> 773 int index = function->shared()->scope_info()->
774 StackSlotIndex(Heap::arguments_symbol()); 774 StackSlotIndex(Heap::arguments_symbol());
775 if (index >= 0) { 775 if (index >= 0) {
776 Handle<Object> arguments = 776 Handle<Object> arguments =
777 Handle<Object>(frame->GetExpression(index)); 777 Handle<Object>(frame->GetExpression(index));
778 if (!arguments->IsTheHole()) return *arguments; 778 if (!arguments->IsArgumentsMarker()) return *arguments;
779 } 779 }
780 780
781 // If there isn't an arguments variable in the stack, we need to 781 // If there isn't an arguments variable in the stack, we need to
782 // find the frame that holds the actual arguments passed to the 782 // find the frame that holds the actual arguments passed to the
783 // function on the stack. 783 // function on the stack.
784 it.AdvanceToArgumentsFrame(); 784 it.AdvanceToArgumentsFrame();
785 frame = it.frame(); 785 frame = it.frame();
786 786
787 // Get the number of arguments and construct an arguments object 787 // Get the number of arguments and construct an arguments object
788 // mirror for the right frame. 788 // mirror for the right frame.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 } 894 }
895 895
896 896
897 const AccessorDescriptor Accessors::ObjectPrototype = { 897 const AccessorDescriptor Accessors::ObjectPrototype = {
898 ObjectGetPrototype, 898 ObjectGetPrototype,
899 ObjectSetPrototype, 899 ObjectSetPrototype,
900 0 900 0
901 }; 901 };
902 902
903 } } // namespace v8::internal 903 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/arm/codegen-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698