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

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

Issue 13408005: Force context allocation for variables in generator scopes. (Closed) Base URL: git://github.com/v8/v8.git@master
Patch Set: Created 7 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
« no previous file with comments | « no previous file | src/ia32/full-codegen-ia32.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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 __ LoadRoot(r2, Heap::kUndefinedValueRootIndex); 155 __ LoadRoot(r2, Heap::kUndefinedValueRootIndex);
156 __ str(r2, MemOperand(sp, receiver_offset)); 156 __ str(r2, MemOperand(sp, receiver_offset));
157 __ bind(&ok); 157 __ bind(&ok);
158 } 158 }
159 159
160 // Open a frame scope to indicate that there is a frame on the stack. The 160 // Open a frame scope to indicate that there is a frame on the stack. The
161 // MANUAL indicates that the scope shouldn't actually generate code to set up 161 // MANUAL indicates that the scope shouldn't actually generate code to set up
162 // the frame (that is done below). 162 // the frame (that is done below).
163 FrameScope frame_scope(masm_, StackFrame::MANUAL); 163 FrameScope frame_scope(masm_, StackFrame::MANUAL);
164 164
165 int locals_count = info->scope()->num_stack_slots();
166
167 info->set_prologue_offset(masm_->pc_offset()); 165 info->set_prologue_offset(masm_->pc_offset());
168 { 166 {
169 PredictableCodeSizeScope predictible_code_size_scope( 167 PredictableCodeSizeScope predictible_code_size_scope(
170 masm_, kNoCodeAgeSequenceLength * Assembler::kInstrSize); 168 masm_, kNoCodeAgeSequenceLength * Assembler::kInstrSize);
171 // The following three instructions must remain together and unmodified 169 // The following three instructions must remain together and unmodified
172 // for code aging to work properly. 170 // for code aging to work properly.
173 __ stm(db_w, sp, r1.bit() | cp.bit() | fp.bit() | lr.bit()); 171 __ stm(db_w, sp, r1.bit() | cp.bit() | fp.bit() | lr.bit());
174 // Load undefined value here, so the value is ready for the loop 172 // Load undefined value here, so the value is ready for the loop
175 // below. 173 // below.
176 __ LoadRoot(ip, Heap::kUndefinedValueRootIndex); 174 __ LoadRoot(ip, Heap::kUndefinedValueRootIndex);
177 // Adjust FP to point to saved FP. 175 // Adjust FP to point to saved FP.
178 __ add(fp, sp, Operand(2 * kPointerSize)); 176 __ add(fp, sp, Operand(2 * kPointerSize));
179 } 177 }
180 178
181 { Comment cmnt(masm_, "[ Allocate locals"); 179 { Comment cmnt(masm_, "[ Allocate locals");
180 int locals_count = info->scope()->num_stack_slots();
181 // Generators allocate locals, if any, in context slots.
182 ASSERT(!info->function()->is_generator() || locals_count == 0);
182 for (int i = 0; i < locals_count; i++) { 183 for (int i = 0; i < locals_count; i++) {
183 __ push(ip); 184 __ push(ip);
184 } 185 }
185 } 186 }
186 187
187 bool function_in_register = true; 188 bool function_in_register = true;
188 189
189 // Possibly allocate a local context. 190 // Possibly allocate a local context.
190 int heap_slots = info->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS; 191 int heap_slots = info->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS;
191 if (heap_slots > 0) { 192 if (heap_slots > 0) {
(...skipping 4388 matching lines...) Expand 10 before | Expand all | Expand 10 after
4580 *context_length = 0; 4581 *context_length = 0;
4581 return previous_; 4582 return previous_;
4582 } 4583 }
4583 4584
4584 4585
4585 #undef __ 4586 #undef __
4586 4587
4587 } } // namespace v8::internal 4588 } } // namespace v8::internal
4588 4589
4589 #endif // V8_TARGET_ARCH_ARM 4590 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/full-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698