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

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

Issue 2435023002: Use a different map to distinguish eval contexts (Closed)
Patch Set: Crankshaft backends and scope deserialization Created 4 years, 2 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
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 #include "src/crankshaft/arm/lithium-codegen-arm.h" 5 #include "src/crankshaft/arm/lithium-codegen-arm.h"
6 6
7 #include "src/base/bits.h" 7 #include "src/base/bits.h"
8 #include "src/code-factory.h" 8 #include "src/code-factory.h"
9 #include "src/code-stubs.h" 9 #include "src/code-stubs.h"
10 #include "src/crankshaft/arm/lithium-gap-resolver-arm.h" 10 #include "src/crankshaft/arm/lithium-gap-resolver-arm.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 bool need_write_barrier = true; 157 bool need_write_barrier = true;
158 // Argument to NewContext is the function, which is in r1. 158 // Argument to NewContext is the function, which is in r1.
159 int slots = info()->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS; 159 int slots = info()->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS;
160 Safepoint::DeoptMode deopt_mode = Safepoint::kNoLazyDeopt; 160 Safepoint::DeoptMode deopt_mode = Safepoint::kNoLazyDeopt;
161 if (info()->scope()->is_script_scope()) { 161 if (info()->scope()->is_script_scope()) {
162 __ push(r1); 162 __ push(r1);
163 __ Push(info()->scope()->scope_info()); 163 __ Push(info()->scope()->scope_info());
164 __ CallRuntime(Runtime::kNewScriptContext); 164 __ CallRuntime(Runtime::kNewScriptContext);
165 deopt_mode = Safepoint::kLazyDeopt; 165 deopt_mode = Safepoint::kLazyDeopt;
166 } else { 166 } else {
167 FastNewFunctionContextStub stub(isolate()); 167 FastNewFunctionContextStub stub(isolate(),
168 info()->scope()->is_eval_scope());
168 __ mov(FastNewFunctionContextDescriptor::SlotsRegister(), Operand(slots)); 169 __ mov(FastNewFunctionContextDescriptor::SlotsRegister(), Operand(slots));
169 __ CallStub(&stub); 170 __ CallStub(&stub);
170 // Result of FastNewFunctionContextStub is always in new space. 171 // Result of FastNewFunctionContextStub is always in new space.
171 need_write_barrier = false; 172 need_write_barrier = false;
172 } 173 }
173 RecordSafepoint(deopt_mode); 174 RecordSafepoint(deopt_mode);
174 175
175 // Context is returned in both r0 and cp. It replaces the context 176 // Context is returned in both r0 and cp. It replaces the context
176 // passed to us. It's saved in the stack and kept live in cp. 177 // passed to us. It's saved in the stack and kept live in cp.
177 __ mov(cp, r0); 178 __ mov(cp, r0);
(...skipping 5223 matching lines...) Expand 10 before | Expand all | Expand 10 after
5401 __ ldr(result, FieldMemOperand(scratch, 5402 __ ldr(result, FieldMemOperand(scratch,
5402 FixedArray::kHeaderSize - kPointerSize)); 5403 FixedArray::kHeaderSize - kPointerSize));
5403 __ bind(deferred->exit()); 5404 __ bind(deferred->exit());
5404 __ bind(&done); 5405 __ bind(&done);
5405 } 5406 }
5406 5407
5407 #undef __ 5408 #undef __
5408 5409
5409 } // namespace internal 5410 } // namespace internal
5410 } // namespace v8 5411 } // namespace v8
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698