Store the scope info in catch contexts

src/compiler/js-operator.h

 // 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.
 
 #ifndef V8_COMPILER_JS_OPERATOR_H_
 #define V8_COMPILER_JS_OPERATOR_H_
 
 #include "src/compiler/type-hints.h"
 #include "src/runtime/runtime.h"
 
@@ skipping 160 matching lines @@
 
 bool operator==(ContextAccess const&, ContextAccess const&);
 bool operator!=(ContextAccess const&, ContextAccess const&);
 
 size_t hash_value(ContextAccess const&);
 
 std::ostream& operator<<(std::ostream&, ContextAccess const&);
 
 ContextAccess const& ContextAccessOf(Operator const*);
 
+// Defines the name and ScopeInfo for a new catch context.
+class CreateCatchContextParameters final {
+ public:
+  CreateCatchContextParameters(Handle<String> catch_name,
+                               Handle<ScopeInfo> scope_info);
+
+  Handle<String> catch_name() const { return catch_name_; }
+  Handle<ScopeInfo> scope_info() const { return scope_info_; }
+
+ private:
+  Handle<String> const catch_name_;

[marja, 2016/09/02 07:39:35]

This is an uncommon way to do const, a more common would be "const
Handle<String>".

[jochen (gone - plz use gerrit), 2016/09/02 08:27:15]

Just copying what the other operators in this file do

+  Handle<ScopeInfo> const scope_info_;
+};
+
+bool operator==(CreateCatchContextParameters const&,
+                CreateCatchContextParameters const&);
+bool operator!=(CreateCatchContextParameters const&,
+                CreateCatchContextParameters const&);
+
+size_t hash_value(CreateCatchContextParameters const&);
+
+std::ostream& operator<<(std::ostream&, CreateCatchContextParameters const&);

[marja, 2016/09/02 07:39:35]

What's up with this style?

[jochen (gone - plz use gerrit), 2016/09/02 08:27:15]

you mean like missing parameter names?

[marja, 2016/09/02 09:34:54]

No, I meant CreateCatchContextParameters const& instead of const
CreateCatchContextParameters&, but this file seems indeed to be some kind of an
exception to the coding style :/

+
+CreateCatchContextParameters const& CreateCatchContextParametersOf(
+    Operator const*);
 
 // Defines the property of an object for a named access. This is
 // used as a parameter by the JSLoadNamed and JSStoreNamed operators.
 class NamedAccess final {
  public:
   NamedAccess(LanguageMode language_mode, Handle<Name> name,
               VectorSlotPair const& feedback)
       : name_(name), feedback_(feedback), language_mode_(language_mode) {}
 
   Handle<Name> name() const { return name_; }
@@ skipping 283 matching lines @@
   // Used to implement Ignition's SuspendGenerator bytecode.
   const Operator* GeneratorStore(int register_count);
 
   // Used to implement Ignition's ResumeGenerator bytecode.
   const Operator* GeneratorRestoreContinuation();
   const Operator* GeneratorRestoreRegister(int index);
 
   const Operator* StackCheck();
 
   const Operator* CreateFunctionContext(int slot_count);
-  const Operator* CreateCatchContext(const Handle<String>& name);
+  const Operator* CreateCatchContext(const Handle<String>& name,
+                                     const Handle<ScopeInfo>& scope_info);
   const Operator* CreateWithContext();
   const Operator* CreateBlockContext(const Handle<ScopeInfo>& scpope_info);
   const Operator* CreateModuleContext();
   const Operator* CreateScriptContext(const Handle<ScopeInfo>& scpope_info);
 
  private:
   Zone* zone() const { return zone_; }
 
   const JSOperatorGlobalCache& cache_;
   Zone* const zone_;
 
   DISALLOW_COPY_AND_ASSIGN(JSOperatorBuilder);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_JS_OPERATOR_H_