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

Side by Side Diff: src/crankshaft/ia32/lithium-codegen-ia32.cc

Issue 2435023002: Use a different map to distinguish eval contexts (Closed)
Patch Set: relax dchecks Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if V8_TARGET_ARCH_IA32 5 #if V8_TARGET_ARCH_IA32
6 6
7 #include "src/crankshaft/ia32/lithium-codegen-ia32.h" 7 #include "src/crankshaft/ia32/lithium-codegen-ia32.h"
8 8
9 #include "src/base/bits.h" 9 #include "src/base/bits.h"
10 #include "src/code-factory.h" 10 #include "src/code-factory.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // Argument to NewContext is the function, which is still in edi. 170 // Argument to NewContext is the function, which is still in edi.
171 int slots = info_->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS; 171 int slots = info_->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS;
172 Safepoint::DeoptMode deopt_mode = Safepoint::kNoLazyDeopt; 172 Safepoint::DeoptMode deopt_mode = Safepoint::kNoLazyDeopt;
173 if (info()->scope()->is_script_scope()) { 173 if (info()->scope()->is_script_scope()) {
174 __ push(edi); 174 __ push(edi);
175 __ Push(info()->scope()->scope_info()); 175 __ Push(info()->scope()->scope_info());
176 __ CallRuntime(Runtime::kNewScriptContext); 176 __ CallRuntime(Runtime::kNewScriptContext);
177 deopt_mode = Safepoint::kLazyDeopt; 177 deopt_mode = Safepoint::kLazyDeopt;
178 } else { 178 } else {
179 if (slots <= FastNewFunctionContextStub::kMaximumSlots) { 179 if (slots <= FastNewFunctionContextStub::kMaximumSlots) {
180 FastNewFunctionContextStub stub(isolate()); 180 if (info()->scope()->is_eval_scope()) {
181 __ mov(FastNewFunctionContextDescriptor::SlotsRegister(), 181 FastNewEvalContextStub stub(isolate());
182 Immediate(slots)); 182 __ Set(FastNewEvalContextDescriptor::SlotsRegister(), slots);
183 __ CallStub(&stub); 183 __ CallStub(&stub);
184 } else {
185 FastNewFunctionContextStub stub(isolate());
186 __ Set(FastNewFunctionContextDescriptor::SlotsRegister(), slots);
187 __ CallStub(&stub);
188 }
184 // Result of FastNewFunctionContextStub is always in new space. 189 // Result of FastNewFunctionContextStub is always in new space.
185 need_write_barrier = false; 190 need_write_barrier = false;
186 } else { 191 } else {
187 __ push(edi); 192 __ Push(edi);
188 __ CallRuntime(Runtime::kNewFunctionContext); 193 __ CallRuntime(info()->scope()->is_eval_scope()
194 ? Runtime::kNewEvalContext
195 : Runtime::kNewFunctionContext);
189 } 196 }
190 } 197 }
191 RecordSafepoint(deopt_mode); 198 RecordSafepoint(deopt_mode);
192 199
193 // Context is returned in eax. It replaces the context passed to us. 200 // Context is returned in eax. It replaces the context passed to us.
194 // It's saved in the stack and kept live in esi. 201 // It's saved in the stack and kept live in esi.
195 __ mov(esi, eax); 202 __ mov(esi, eax);
196 __ mov(Operand(ebp, StandardFrameConstants::kContextOffset), eax); 203 __ mov(Operand(ebp, StandardFrameConstants::kContextOffset), eax);
197 204
198 // Copy parameters into context if necessary. 205 // Copy parameters into context if necessary.
(...skipping 4950 matching lines...) Expand 10 before | Expand all | Expand 10 after
5149 __ bind(deferred->exit()); 5156 __ bind(deferred->exit());
5150 __ bind(&done); 5157 __ bind(&done);
5151 } 5158 }
5152 5159
5153 #undef __ 5160 #undef __
5154 5161
5155 } // namespace internal 5162 } // namespace internal
5156 } // namespace v8 5163 } // namespace v8
5157 5164
5158 #endif // V8_TARGET_ARCH_IA32 5165 #endif // V8_TARGET_ARCH_IA32
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698