| Index: src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| diff --git a/src/crankshaft/arm64/lithium-codegen-arm64.cc b/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| index ae2d85cb23e30088ee651075cf0a06263b9abf2b..141ac3f6108217e805e45cc83fccb9ed58654af7 100644
|
| --- a/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| +++ b/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "src/arm64/frames-arm64.h"
|
| #include "src/base/bits.h"
|
| +#include "src/builtins/builtins-constructor.h"
|
| #include "src/code-factory.h"
|
| #include "src/code-stubs.h"
|
| #include "src/crankshaft/arm64/lithium-gap-resolver-arm64.h"
|
| @@ -618,12 +619,13 @@ void LCodeGen::DoPrologue(LPrologue* instr) {
|
| __ CallRuntime(Runtime::kNewScriptContext);
|
| deopt_mode = Safepoint::kLazyDeopt;
|
| } else {
|
| - if (slots <= FastNewFunctionContextStub::MaximumSlots()) {
|
| - FastNewFunctionContextStub stub(isolate(),
|
| - info()->scope()->scope_type());
|
| + if (slots <=
|
| + ConstructorBuiltinsAssembler::MaximumFunctionContextSlots()) {
|
| + Callable callable = CodeFactory::FastNewFunctionContext(
|
| + isolate(), info()->scope()->scope_type());
|
| __ Mov(FastNewFunctionContextDescriptor::SlotsRegister(), slots);
|
| - __ CallStub(&stub);
|
| - // Result of FastNewFunctionContextStub is always in new space.
|
| + __ Call(callable.code(), RelocInfo::CODE_TARGET);
|
| + // Result of the FastNewFunctionContext builtin is always in new space.
|
| need_write_barrier = false;
|
| } else {
|
| __ Push(x1);
|
|
|