Index: src/crankshaft/ia32/lithium-ia32.cc |
diff --git a/src/crankshaft/ia32/lithium-ia32.cc b/src/crankshaft/ia32/lithium-ia32.cc |
index 17232cd2acf1230a3d24b1572931d83a5f49b742..8a87316709745a0ca996d6c0effc38655b5adde8 100644 |
--- a/src/crankshaft/ia32/lithium-ia32.cc |
+++ b/src/crankshaft/ia32/lithium-ia32.cc |
@@ -910,10 +910,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) { |