Revert of Separate Scope into DeclarationScope and Scope

src/interpreter/bytecode-generator.h

Index: src/interpreter/bytecode-generator.h
diff --git a/src/interpreter/bytecode-generator.h b/src/interpreter/bytecode-generator.h
index f063dd455707b2ccc0bbd38f6a42261e3ce94832..ec282dd2bd63abed566d2b555f101bf7232e3d57 100644
--- a/src/interpreter/bytecode-generator.h
+++ b/src/interpreter/bytecode-generator.h
@@ -175,7 +175,7 @@
   inline BytecodeArrayBuilder* builder() const { return builder_; }
   inline Isolate* isolate() const { return isolate_; }
   inline Zone* zone() const { return zone_; }
-  inline DeclarationScope* scope() const { return scope_; }
+  inline Scope* scope() const { return scope_; }
   inline CompilationInfo* info() const { return info_; }
 
   inline ControlScope* execution_control() const { return execution_control_; }
@@ -206,7 +206,7 @@
   Zone* zone_;
   BytecodeArrayBuilder* builder_;
   CompilationInfo* info_;
-  DeclarationScope* scope_;
+  Scope* scope_;
   GlobalDeclarationsBuilder* globals_builder_;
   ZoneVector<GlobalDeclarationsBuilder*> global_declarations_;
   ZoneVector<std::pair<FunctionLiteral*, size_t>> function_literals_;