| Index: src/crankshaft/x64/lithium-x64.cc
|
| diff --git a/src/crankshaft/x64/lithium-x64.cc b/src/crankshaft/x64/lithium-x64.cc
|
| index b06e52107d36ed285b71064f79e9d562aa1d0328..5e2e9fa4cd48ba6df9004ddcc51280a1fb4f58e2 100644
|
| --- a/src/crankshaft/x64/lithium-x64.cc
|
| +++ b/src/crankshaft/x64/lithium-x64.cc
|
| @@ -902,10 +902,12 @@ void LChunkBuilder::AddInstruction(LInstruction* instr,
|
| DCHECK_NOT_NULL(hydrogen_env);
|
| if (instr->IsSyntacticTailCall()) {
|
| // If it was a syntactic tail call we need to drop the current frame and
|
| - // an arguments adaptor frame on top of it (if the latter is present).
|
| + // all the frames on top of it that are either an arguments adaptor frame
|
| + // or a tail caller frame.
|
| hydrogen_env = hydrogen_env->outer();
|
| - if (hydrogen_env != nullptr &&
|
| - hydrogen_env->frame_type() == ARGUMENTS_ADAPTOR) {
|
| + while (hydrogen_env != nullptr &&
|
| + (hydrogen_env->frame_type() == ARGUMENTS_ADAPTOR ||
|
| + hydrogen_env->frame_type() == TAIL_CALLER_FUNCTION)) {
|
| hydrogen_env = hydrogen_env->outer();
|
| }
|
| if (hydrogen_env != nullptr) {
|
|
|