[crankshaft] Fix environment handling after leaving inlined tail call.

src/crankshaft/hydrogen.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/crankshaft/hydrogen.h"
 
 #include <sstream>
 
 #include "src/allocation-site-scopes.h"
 #include "src/ast/ast-numbering.h"
@@ skipping 13144 matching lines @@
   }
   new_env->ClearHistory();
   return new_env;
 }
 
 void HEnvironment::MarkAsTailCaller() {
   DCHECK_EQ(JS_FUNCTION, frame_type());
   frame_type_ = TAIL_CALLER_FUNCTION;
 }
 
+void HEnvironment::ClearTailCallerMark() {
+  DCHECK_EQ(TAIL_CALLER_FUNCTION, frame_type());
+  frame_type_ = JS_FUNCTION;
+}
+
 HEnvironment* HEnvironment::CopyForInlining(
     Handle<JSFunction> target, int arguments, FunctionLiteral* function,
     HConstant* undefined, InliningKind inlining_kind,
     TailCallMode syntactic_tail_call_mode) const {
   DCHECK_EQ(JS_FUNCTION, frame_type());
 
   // Outer environment is a copy of this one without the arguments.
   int arity = function->scope()->num_parameters();
 
   HEnvironment* outer = Copy();
@@ skipping 390 matching lines @@
     isolate()->GetHTracer()->TraceHydrogen(name(), graph_);
   }
 
 #ifdef DEBUG
   graph_->Verify(false);  // No full verify.
 #endif
 }
 
 }  // namespace internal
 }  // namespace v8