Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(712)

Unified Diff: runtime/vm/parser.h

Issue 2818273002: Remove parent_level field of function type parameters. (Closed)
Patch Set: address comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.h
diff --git a/runtime/vm/parser.h b/runtime/vm/parser.h
index d6bdde4f1faf74116918fcaa6e27b613bc460d20..fa19e75cd8a25c924b6749be6fab50883f73ed41 100644
--- a/runtime/vm/parser.h
+++ b/runtime/vm/parser.h
@@ -96,7 +96,8 @@ class ParsedFunction : public ZoneAllocated {
node_sequence_(NULL),
regexp_compile_data_(NULL),
instantiator_(NULL),
- function_instantiator_(NULL),
+ function_type_arguments_(NULL),
+ parent_type_arguments_(NULL),
current_context_var_(NULL),
expression_temp_var_(NULL),
finally_return_temp_var_(NULL),
@@ -134,12 +135,19 @@ class ParsedFunction : public ZoneAllocated {
ASSERT(instantiator != NULL);
instantiator_ = instantiator;
}
- LocalVariable* function_instantiator() const {
- return function_instantiator_;
+ LocalVariable* function_type_arguments() const {
+ return function_type_arguments_;
}
- void set_function_instantiator(LocalVariable* function_instantiator) {
- ASSERT(function_instantiator != NULL);
- function_instantiator_ = function_instantiator;
+ void set_function_type_arguments(LocalVariable* function_type_arguments) {
+ ASSERT(function_type_arguments != NULL);
+ function_type_arguments_ = function_type_arguments;
+ }
+ LocalVariable* parent_type_arguments() const {
+ return parent_type_arguments_;
+ }
+ void set_parent_type_arguments(LocalVariable* parent_type_arguments) {
+ ASSERT(parent_type_arguments != NULL);
+ parent_type_arguments_ = parent_type_arguments;
}
void set_default_parameter_values(ZoneGrowableArray<const Instance*>* list) {
@@ -232,7 +240,8 @@ class ParsedFunction : public ZoneAllocated {
SequenceNode* node_sequence_;
RegExpCompileData* regexp_compile_data_;
LocalVariable* instantiator_;
- LocalVariable* function_instantiator_;
+ LocalVariable* function_type_arguments_;
+ LocalVariable* parent_type_arguments_;
LocalVariable* current_context_var_;
LocalVariable* expression_temp_var_;
LocalVariable* finally_return_temp_var_;
@@ -681,7 +690,7 @@ class Parser : public ValueObject {
LocalVariable* LookupTypeArgumentsParameter(LocalScope* from_scope,
bool test_only);
void CaptureInstantiator();
- void CaptureFunctionInstantiators();
+ void CaptureFunctionTypeArguments();
void CaptureAllInstantiators();
AstNode* LoadReceiver(TokenPosition token_pos);
AstNode* LoadFieldIfUnresolved(AstNode* node);
@@ -846,7 +855,6 @@ class Parser : public ValueObject {
bool ParsingStaticMember() const;
const AbstractType* ReceiverType(const Class& cls);
bool IsInstantiatorRequired() const;
- bool AreFunctionInstantiatorsRequired() const;
bool InGenericFunctionScope() const;
bool ResolveIdentInLocalScope(TokenPosition ident_pos,
const String& ident,
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698