Reland of [interpreter] Correctly thread through catch prediction.

src/interpreter/control-flow-builders.h

 // Copyright 2015 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.
 
 #ifndef V8_INTERPRETER_CONTROL_FLOW_BUILDERS_H_
 #define V8_INTERPRETER_CONTROL_FLOW_BUILDERS_H_
 
 #include "src/interpreter/bytecode-array-builder.h"
 
 #include "src/zone-containers.h"
@@ skipping 147 matching lines @@
  private:
   int handler_id_;
   BytecodeLabel handler_;
   BytecodeLabel exit_;
 };
 
 
 // A class to help with co-ordinating control flow in try-finally statements.
 class TryFinallyBuilder final : public ControlFlowBuilder {
  public:
-  explicit TryFinallyBuilder(BytecodeArrayBuilder* builder)
+  explicit TryFinallyBuilder(BytecodeArrayBuilder* builder, bool will_catch)
       : ControlFlowBuilder(builder),
         handler_id_(builder->NewHandlerEntry()),
-        finalization_sites_(builder->zone()) {}
+        finalization_sites_(builder->zone()),
+        will_catch_(will_catch) {}
 
   void BeginTry(Register context);
   void LeaveTry();
   void EndTry();
   void BeginHandler();
   void BeginFinally();
   void EndFinally();
 
  private:
   int handler_id_;
   BytecodeLabel handler_;
 
   // Unbound labels that identify jumps to the finally block in the code.
   ZoneVector<BytecodeLabel> finalization_sites_;
+
+  // Conservative prediction of whether exceptions thrown into the handler for
+  // this finally block will be caught. Note that such a prediction depends on
+  // whether this try-finally is nested inside a surrounding try-catch.
+  bool will_catch_;
 };
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_INTERPRETER_CONTROL_FLOW_BUILDERS_H_