Revert of Make non-Module generators only context allocate parameters.

src/debug/debug-scopes.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_DEBUG_DEBUG_SCOPES_H_
 #define V8_DEBUG_DEBUG_SCOPES_H_
 
 #include "src/debug/debug-frames.h"
 #include "src/frames.h"
 
@@ skipping 75 matching lines @@
         : scope_info(info), start_position(start), end_position(end) {}
     explicit ExtendedScopeInfo(Handle<ScopeInfo> info)
         : scope_info(info), start_position(-1), end_position(-1) {}
     Handle<ScopeInfo> scope_info;
     int start_position;
     int end_position;
     bool is_hidden() { return start_position == -1 && end_position == -1; }
   };
 
   Isolate* isolate_;
-  FrameInspector* const frame_inspector_ = nullptr;
-  Handle<JSGeneratorObject> generator_;
+  FrameInspector* const frame_inspector_;
   Handle<Context> context_;
   List<ExtendedScopeInfo> nested_scope_chain_;
   Handle<StringSet> non_locals_;
   bool seen_script_scope_;
 
   inline JavaScriptFrame* GetFrame() {
     return frame_inspector_->GetArgumentsFrame();
   }
 
-  Handle<Context> GetContext();
-  Handle<JSFunction> GetFunction();
-  int GetSourcePosition();
-
-  void MaterializeStackLocals(Handle<JSObject> local_scope,
-                              Handle<ScopeInfo> scope_info);
-
-  void TryParseAndRetrieveScopes(ScopeIterator::Option option);
+  inline Handle<JSFunction> GetFunction() {
+    return frame_inspector_->GetFunction();
+  }
 
   void RetrieveScopeChain(DeclarationScope* scope);
 
   void CollectNonLocals(ParseInfo* info, DeclarationScope* scope);
 
   void UnwrapEvaluationContext();
 
   MUST_USE_RESULT MaybeHandle<JSObject> MaterializeScriptScope();
   MUST_USE_RESULT MaybeHandle<JSObject> MaterializeLocalScope();
   MUST_USE_RESULT MaybeHandle<JSObject> MaterializeModuleScope();
   Handle<JSObject> MaterializeClosure();
   Handle<JSObject> MaterializeCatchScope();
   Handle<JSObject> MaterializeInnerScope();
   Handle<JSObject> WithContextExtension();
 
   bool SetLocalVariableValue(Handle<String> variable_name,
                              Handle<Object> new_value);
   bool SetInnerScopeVariableValue(Handle<String> variable_name,
                                   Handle<Object> new_value);
   bool SetClosureVariableValue(Handle<String> variable_name,
                                Handle<Object> new_value);
   bool SetScriptVariableValue(Handle<String> variable_name,
                               Handle<Object> new_value);
   bool SetCatchVariableValue(Handle<String> variable_name,
                              Handle<Object> new_value);
 
   // Helper functions.
-  bool SetParameterValue(Handle<ScopeInfo> scope_info,
+  bool SetParameterValue(Handle<ScopeInfo> scope_info, JavaScriptFrame* frame,
                          Handle<String> parameter_name,
                          Handle<Object> new_value);
   bool SetStackVariableValue(Handle<ScopeInfo> scope_info,
                              Handle<String> variable_name,
                              Handle<Object> new_value);
   bool SetContextVariableValue(Handle<ScopeInfo> scope_info,
                                Handle<Context> context,
                                Handle<String> variable_name,
                                Handle<Object> new_value);
 
@@ skipping 14 matching lines @@
   void GetNestedScopeChain(Isolate* isolate, Scope* scope,
                            int statement_position);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ScopeIterator);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_DEBUG_DEBUG_SCOPES_H_