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

Side by Side Diff: src/x64/full-codegen-x64.cc

Issue 6625048: Strict mode arguments do not share binding with formal parameters. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 9 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
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 __ lea(rdx, 193 __ lea(rdx,
194 Operand(rbp, StandardFrameConstants::kCallerSPOffset + offset)); 194 Operand(rbp, StandardFrameConstants::kCallerSPOffset + offset));
195 __ push(rdx); 195 __ push(rdx);
196 __ Push(Smi::FromInt(scope()->num_parameters())); 196 __ Push(Smi::FromInt(scope()->num_parameters()));
197 // Arguments to ArgumentsAccessStub: 197 // Arguments to ArgumentsAccessStub:
198 // function, receiver address, parameter count. 198 // function, receiver address, parameter count.
199 // The stub will rewrite receiver and parameter count if the previous 199 // The stub will rewrite receiver and parameter count if the previous
200 // stack frame was an arguments adapter frame. 200 // stack frame was an arguments adapter frame.
201 ArgumentsAccessStub stub(ArgumentsAccessStub::NEW_OBJECT); 201 ArgumentsAccessStub stub(ArgumentsAccessStub::NEW_OBJECT);
202 __ CallStub(&stub); 202 __ CallStub(&stub);
203 // Store new arguments object in both "arguments" and ".arguments" slots. 203
204 __ movq(rcx, rax); 204 Variable* arguments_shadow = scope()->arguments_shadow();
205 Move(arguments->AsSlot(), rax, rbx, rdx); 205 if (arguments_shadow != NULL) {
206 Slot* dot_arguments_slot = scope()->arguments_shadow()->AsSlot(); 206 // Store new arguments object in both "arguments" and ".arguments" slots.
207 Move(dot_arguments_slot, rcx, rbx, rdx); 207 __ movq(rcx, rax);
208 Move(arguments->AsSlot(), rax, rbx, rdx);
209 Move(arguments_shadow->AsSlot(), rcx, rbx, rdx);
210 } else {
211 // arguments are allocated without shadow only in strict mode.
212 ASSERT(scope()->is_strict_mode());
213 Move(arguments->AsSlot(), rax, rbx, rdx);
214 }
208 } 215 }
209 216
210 if (FLAG_trace) { 217 if (FLAG_trace) {
211 __ CallRuntime(Runtime::kTraceEnter, 0); 218 __ CallRuntime(Runtime::kTraceEnter, 0);
212 } 219 }
213 220
214 // Visit the declarations and body unless there is an illegal 221 // Visit the declarations and body unless there is an illegal
215 // redeclaration. 222 // redeclaration.
216 if (scope()->HasIllegalRedeclaration()) { 223 if (scope()->HasIllegalRedeclaration()) {
217 Comment cmnt(masm_, "[ Declarations"); 224 Comment cmnt(masm_, "[ Declarations");
(...skipping 3744 matching lines...) Expand 10 before | Expand all | Expand 10 after
3962 __ ret(0); 3969 __ ret(0);
3963 } 3970 }
3964 3971
3965 3972
3966 #undef __ 3973 #undef __
3967 3974
3968 3975
3969 } } // namespace v8::internal 3976 } } // namespace v8::internal
3970 3977
3971 #endif // V8_TARGET_ARCH_X64 3978 #endif // V8_TARGET_ARCH_X64
OLDNEW
« src/parser.cc ('K') | « src/x64/codegen-x64.cc ('k') | test/es5conform/es5conform.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698