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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/kernel_binary_flowgraph.cc

Issue 2921613003: [kernel] Streaming refactorings. (Closed)
Patch Set: Re-apply the reordering of required_parameter_count and total_parameter_count Created 3 years, 6 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/kernel_binary_flowgraph.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/kernel_binary_flowgraph.cc
diff --git a/runtime/vm/kernel_binary_flowgraph.cc b/runtime/vm/kernel_binary_flowgraph.cc
index adcfcec719e3b803ee48ddef5a1239653079e14e..85c9a20424758a5e2cc8f48445c11e8722238e7a 100644
--- a/runtime/vm/kernel_binary_flowgraph.cc
+++ b/runtime/vm/kernel_binary_flowgraph.cc
@@ -119,6 +119,8 @@ ScopeBuildingResult* StreamingScopeBuilder::BuildScopes() {
intptr_t parent_offset = -1;
builder_->SetOffset(kernel_offset_);
+ FunctionNodeHelper function_node_helper(builder_);
+
switch (function.kind()) {
case RawFunction::kClosureFunction:
case RawFunction::kRegularFunction:
@@ -127,13 +129,10 @@ ScopeBuildingResult* StreamingScopeBuilder::BuildScopes() {
case RawFunction::kConstructor: {
const Tag tag = builder_->PeekTag();
parent_offset = builder_->ReadUntilFunctionNode();
- word async_marker_word;
- builder_->ReadFunctionNodeUntilTypeParameters(
- &unused_tokenposition, &unused_tokenposition, &async_marker_word,
- &unused_word); // read first part of function node.
- current_function_async_marker_ =
- static_cast<FunctionNode::AsyncMarker>(async_marker_word);
- // NOTE: FunctionNode is not read entirely yet! It continues below the if.
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
+ current_function_async_marker_ = function_node_helper.async_marker_;
+ // NOTE: FunctionNode is read further below the if.
intptr_t pos = 0;
if (function.IsClosureFunction()) {
@@ -158,26 +157,20 @@ ScopeBuildingResult* StreamingScopeBuilder::BuildScopes() {
if (tag == kConstructor) {
ASSERT(parent_offset >= 0);
AlternativeReadingScope alt(builder_->reader_, parent_offset);
- builder_->ReadClassUntilFields(); // read first part of class.
+ ClassHelper class_helper(builder_);
+ class_helper.ReadUntilExcluding(ClassHelper::kFields);
intptr_t list_length =
builder_->ReadListLength(); // read fields list length.
for (intptr_t i = 0; i < list_length; i++) {
intptr_t field_offset = builder_->ReaderOffset();
- TokenPosition position;
- TokenPosition end_position;
- word flags;
- builder_->ReadFieldUntilAnnotation(&unused_nameindex, &position,
- &end_position, &flags,
- &unused_intptr);
- bool is_static = (flags & Field::kFlagStatic) == Field::kFlagStatic;
- builder_->SkipListOfExpressions(); // read annotations.
- builder_->SkipDartType(); // read type.
+ FieldHelper field_helper(builder_);
+ field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
Tag initializer_tag =
builder_->ReadTag(); // read first part of initializer.
- if (!is_static && initializer_tag == kSomething) {
+ if (!field_helper.IsStatic() && initializer_tag == kSomething) {
EnterScope(field_offset);
VisitExpression(); // read initializer.
- ExitScope(position, end_position);
+ ExitScope(field_helper.position_, field_helper.end_position_);
} else if (initializer_tag == kSomething) {
builder_->SkipExpression(); // read initializer.
}
@@ -191,12 +184,9 @@ ScopeBuildingResult* StreamingScopeBuilder::BuildScopes() {
result_->type_arguments_variable = variable;
}
- // Continue reading FunctionNode.
- builder_->SkipTypeParametersList(); // read type_parameters.
- builder_->ReadUInt(); // read total parameter count.
- builder_->ReadUInt(); // read required_parameter_count.
- AddPositionalAndNamedParameters(
- pos); // read positional_parameters and named_parameters.
+ // Continue reading FunctionNode:
+ // read positional_parameters and named_parameters.
+ AddPositionalAndNamedParameters(pos);
// We generate a syntethic body for implicit closure functions - which
// will forward the call to the real function.
@@ -314,24 +304,22 @@ void StreamingScopeBuilder::VisitConstructor() {
// important for closure-valued field initializers because the VM expects the
// corresponding closure functions to appear as if they were nested inside the
// constructor.
- intptr_t parent_offset = builder_->ReadConstructorUntilFunctionNode();
+ ConstructorHelper constructor_helper(builder_);
+ constructor_helper.ReadUntilExcluding(ConstructorHelper::kFunction);
+ intptr_t parent_offset = constructor_helper.parent_class_binary_offset_;
ASSERT(parent_offset >= 0);
{
AlternativeReadingScope alt(builder_->reader_, parent_offset);
- builder_->ReadClassUntilFields(); // read first part of class.
+ ClassHelper class_helper(builder_);
+ class_helper.ReadUntilExcluding(ClassHelper::kFields);
intptr_t list_length =
builder_->ReadListLength(); // read fields list length.
for (intptr_t i = 0; i < list_length; i++) {
- word flags;
- builder_->ReadFieldUntilAnnotation(
- &unused_nameindex, &unused_tokenposition, &unused_tokenposition,
- &flags, &unused_intptr);
- bool is_static = (flags & Field::kFlagStatic) == Field::kFlagStatic;
- builder_->SkipListOfExpressions(); // read annotations.
- builder_->SkipDartType(); // read type.
+ FieldHelper field_helper(builder_);
+ field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
Tag initializer_tag = builder_->ReadTag();
- if (!is_static && initializer_tag == kSomething) {
+ if (!field_helper.IsStatic() && initializer_tag == kSomething) {
VisitExpression(); // read initializer.
} else if (initializer_tag == kSomething) {
builder_->SkipExpression(); // read initializer.
@@ -349,18 +337,16 @@ void StreamingScopeBuilder::VisitConstructor() {
}
void StreamingScopeBuilder::VisitProcedure() {
- Tag function_node = builder_->ReadProcedureUntilFunctionNode(
- &unused_word, &unused_intptr); // read first part of procedure.
- if (function_node == kSomething) {
+ ProcedureHelper procedure_helper(builder_);
+ procedure_helper.ReadUntilExcluding(ProcedureHelper::kFunction);
+ if (builder_->ReadTag() == kSomething) {
VisitFunctionNode();
}
}
void StreamingScopeBuilder::VisitField() {
- builder_->ReadFieldUntilAnnotation(
- &unused_nameindex, &unused_tokenposition, &unused_tokenposition,
- &unused_intptr, &unused_word); // read first part of field.
- builder_->SkipListOfExpressions(); // read annotations.
+ FieldHelper field_helper(builder_);
+ field_helper.ReadUntilExcluding(FieldHelper::kType);
VisitDartType(); // read type.
Tag tag = builder_->ReadTag(); // read initializer (part 1).
if (tag == kSomething) {
@@ -369,15 +355,8 @@ void StreamingScopeBuilder::VisitField() {
}
void StreamingScopeBuilder::VisitFunctionNode() {
- word async_marker_word;
- word dart_async_marker_word;
- builder_->ReadFunctionNodeUntilTypeParameters(
- &unused_tokenposition, &unused_tokenposition, &async_marker_word,
- &dart_async_marker_word);
- FunctionNode::AsyncMarker async_marker =
- static_cast<FunctionNode::AsyncMarker>(async_marker_word);
- FunctionNode::AsyncMarker dart_async_marker =
- static_cast<FunctionNode::AsyncMarker>(dart_async_marker_word);
+ FunctionNodeHelper function_node_helper(builder_);
+ function_node_helper.ReadUntilExcluding(FunctionNodeHelper::kTypeParameters);
intptr_t list_length =
builder_->ReadListLength(); // read type_parameters list length.
@@ -385,17 +364,18 @@ void StreamingScopeBuilder::VisitFunctionNode() {
builder_->SkipStringReference(); // read ith name index.
VisitDartType(); // read ith bound.
}
+ function_node_helper.SetJustRead(FunctionNodeHelper::kTypeParameters);
if (FLAG_causal_async_stacks &&
- (dart_async_marker == FunctionNode::kAsync ||
- dart_async_marker == FunctionNode::kAsyncStar)) {
+ (function_node_helper.dart_async_marker_ == FunctionNode::kAsync ||
+ function_node_helper.dart_async_marker_ == FunctionNode::kAsyncStar)) {
LocalVariable* asyncStackTraceVar = MakeVariable(
TokenPosition::kNoSource, TokenPosition::kNoSource,
Symbols::AsyncStackTraceVar(), AbstractType::dynamic_type());
scope_->AddVariable(asyncStackTraceVar);
}
- if (async_marker == FunctionNode::kSyncYielding) {
+ if (function_node_helper.async_marker_ == FunctionNode::kSyncYielding) {
LocalScope* scope = parsed_function_->node_sequence()->scope();
intptr_t offset = parsed_function_->function().num_fixed_parameters();
for (intptr_t i = 0;
@@ -407,13 +387,7 @@ void StreamingScopeBuilder::VisitFunctionNode() {
// Read (but don't visit) the positional and named parameters, because they've
// already been added to the scope.
-
- builder_->ReadUInt(); // read total parameter count.
- builder_->ReadUInt(); // read required_parameter_count.
-
- builder_->SkipListOfVariableDeclarations(); // read list of positionals.
- builder_->SkipListOfVariableDeclarations(); // read list of named.
- builder_->SkipDartType(); // read return type.
+ function_node_helper.ReadUntilExcluding(FunctionNodeHelper::kBody);
if (builder_->ReadTag() == kSomething) {
PositionScope scope(builder_->reader_);
@@ -423,7 +397,7 @@ void StreamingScopeBuilder::VisitFunctionNode() {
// Ensure that :await_jump_var, :await_ctx_var, :async_op and
// :async_stack_trace are captured.
- if (async_marker == FunctionNode::kSyncYielding) {
+ if (function_node_helper.async_marker_ == FunctionNode::kSyncYielding) {
{
LocalVariable* temp = NULL;
LookupCapturedVariableByName(
@@ -983,21 +957,17 @@ void StreamingScopeBuilder::VisitVariableDeclaration() {
PositionScope scope(builder_->reader_);
intptr_t kernel_offset_no_tag = builder_->ReaderOffset();
- TokenPosition position = builder_->ReadPosition(); // read position.
- builder_->ReadPosition(); // read equals position.
- word flags = builder_->ReadFlags(); // read flags.
- bool is_final = (flags & VariableDeclaration::kFlagFinal) ==
- VariableDeclaration::kFlagFinal;
- StringIndex name_index = builder_->ReadStringReference(); // read name index.
+ VariableDeclarationHelper helper(builder_);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kType);
intptr_t offset_for_type = builder_->ReaderOffset();
AbstractType& type = T.BuildVariableType(); // read type.
// In case `declaration->IsConst()` the flow graph building will take care of
// evaluating the constant and setting it via
// `declaration->SetConstantValue()`.
- const dart::String& name = (H.StringSize(name_index) == 0)
+ const dart::String& name = (H.StringSize(helper.name_index_) == 0)
? GenerateName(":var", name_index_++)
- : H.DartSymbol(name_index);
+ : H.DartSymbol(helper.name_index_);
// We also need to visit the type.
builder_->SetOffset(offset_for_type);
VisitDartType(); // read type.
@@ -1013,8 +983,9 @@ void StreamingScopeBuilder::VisitVariableDeclaration() {
if (end_position.IsReal()) {
end_position.Next();
}
- LocalVariable* variable = MakeVariable(position, end_position, name, type);
- if (is_final) {
+ LocalVariable* variable =
+ MakeVariable(helper.position_, end_position, name, type);
+ if (helper.IsFinal()) {
variable->set_is_final();
}
scope_->AddVariable(variable);
@@ -1117,15 +1088,9 @@ void StreamingScopeBuilder::HandleLocalFunction(intptr_t parent_kernel_offset) {
// "Peek" ahead into the function node
intptr_t offset = builder_->ReaderOffset();
- Tag tag = builder_->ReadTag(); // read tag.
- ASSERT(tag == kFunctionNode);
- TokenPosition position = builder_->ReadPosition(); // read position.
- TokenPosition end_position = builder_->ReadPosition(); // read end position.
- FunctionNode::AsyncMarker async_marker =
- static_cast<FunctionNode::AsyncMarker>(
- builder_->ReadByte()); // read async marker.
- builder_->ReadByte(); // read dart async marker.
- builder_->SkipTypeParametersList(); // read type_parameters.
+ FunctionNodeHelper function_node_helper(builder_);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
LocalScope* saved_function_scope = current_function_scope_;
FunctionNode::AsyncMarker saved_function_async_marker =
@@ -1134,14 +1099,12 @@ void StreamingScopeBuilder::HandleLocalFunction(intptr_t parent_kernel_offset) {
depth_ = DepthState(depth_.function_ + 1);
EnterScope(parent_kernel_offset);
current_function_scope_ = scope_;
- current_function_async_marker_ = async_marker;
+ current_function_async_marker_ = function_node_helper.async_marker_;
if (depth_.function_ == 1) {
FunctionScope function_scope = {offset, scope_};
result_->function_scopes.Add(function_scope);
}
- builder_->ReadUInt(); // read total parameter count.
- builder_->ReadUInt(); // read required_parameter_count.
// read positional_parameters and named_parameters.
AddPositionalAndNamedParameters();
@@ -1150,7 +1113,7 @@ void StreamingScopeBuilder::HandleLocalFunction(intptr_t parent_kernel_offset) {
VisitFunctionNode(); // read function node.
- ExitScope(position, end_position);
+ ExitScope(function_node_helper.position_, function_node_helper.end_position_);
depth_ = saved_depth_state;
current_function_scope_ = saved_function_scope;
current_function_async_marker_ = saved_function_async_marker;
@@ -1186,16 +1149,16 @@ void StreamingScopeBuilder::AddPositionalAndNamedParameters(intptr_t pos) {
void StreamingScopeBuilder::AddVariableDeclarationParameter(intptr_t pos) {
intptr_t kernel_offset = builder_->ReaderOffset(); // no tag.
- TokenPosition position = builder_->ReadPosition(); // read position.
- builder_->ReadPosition(); // read equals position.
- word flags = builder_->ReadFlags(); // read flags.
- bool is_final = (flags & VariableDeclaration::kFlagFinal) ==
- VariableDeclaration::kFlagFinal;
- String& name = H.DartSymbol(builder_->ReadStringReference()); // read name.
+ VariableDeclarationHelper helper(builder_);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kType);
+ String& name = H.DartSymbol(helper.name_index_);
AbstractType& type = T.BuildVariableType(); // read type.
+ helper.SetJustRead(VariableDeclarationHelper::kType);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
- LocalVariable* variable = MakeVariable(position, position, name, type);
- if (is_final) {
+ LocalVariable* variable =
+ MakeVariable(helper.position_, helper.position_, name, type);
+ if (helper.IsFinal()) {
variable->set_is_final();
}
if (variable->name().raw() == Symbols::IteratorParameter().raw()) {
@@ -2275,11 +2238,8 @@ void StreamingConstantEvaluator::EvaluateLet() {
LocalVariable* local = builder_->LookupVariable(kernel_position);
// read variable declaration.
- builder_->ReadPosition(); // read position.
- builder_->ReadPosition(); // read equals position.
- builder_->ReadFlags(); // read flags.
- builder_->SkipStringReference(); // read name index.
- builder_->SkipDartType(); // read type.
+ VariableDeclarationHelper helper(builder_);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
Tag tag = builder_->ReadTag(); // read (first part of) initializer.
if (tag == kNothing) {
local->SetConstValue(Instance::ZoneHandle(Z, dart::Instance::null()));
@@ -2534,19 +2494,24 @@ intptr_t StreamingFlowGraphBuilder::GetParentOffset(intptr_t offset) {
AlternativeReadingScope alt(reader_, offset);
Tag tag = PeekTag();
- intptr_t parent_offset = -1;
switch (tag) {
- case kConstructor:
- return ReadConstructorUntilFunctionNode();
- case kProcedure:
- ReadProcedureUntilFunctionNode(
- &unused_word, &parent_offset); // read first part of procedure.
- return parent_offset;
- case kField:
- ReadFieldUntilAnnotation(&unused_nameindex, &unused_tokenposition,
- &unused_tokenposition, &unused_word,
- &parent_offset);
- return parent_offset;
+ case kConstructor: {
+ ConstructorHelper constructor_helper(this);
+ constructor_helper.ReadUntilIncluding(
+ ConstructorHelper::kParentClassBinaryOffset);
+ return constructor_helper.parent_class_binary_offset_;
+ }
+ case kProcedure: {
+ ProcedureHelper procedure_helper(this);
+ procedure_helper.ReadUntilIncluding(
+ ProcedureHelper::kParentClassBinaryOffset);
+ return procedure_helper.parent_class_binary_offset_;
+ }
+ case kField: {
+ FieldHelper field_helper(this);
+ field_helper.ReadUntilIncluding(FieldHelper::kParentClassBinaryOffset);
+ return field_helper.parent_class_binary_offset_;
+ }
default:
UNIMPLEMENTED();
return -1;
@@ -2559,85 +2524,13 @@ void StreamingFlowGraphBuilder::GetTypeParameterInfoForClass(
intptr_t* type_paremeter_offset) {
AlternativeReadingScope alt(reader_, class_offset);
- ReadClassUntilTypeParameters();
+ ClassHelper class_helper(this);
+ class_helper.ReadUntilExcluding(ClassHelper::kTypeParameters);
*type_paremeter_counts =
ReadListLength(); // read type_parameters list length.
*type_paremeter_offset = ReaderOffset();
}
-void StreamingFlowGraphBuilder::ReadClassUntilFields() {
- ReadClassUntilTypeParameters();
- SkipTypeParametersList(); // read type_parameters.
- Tag type_tag = ReadTag(); // read type (part 1).
- if (type_tag == kSomething) {
- SkipDartType(); // read type (part 2).
- }
- type_tag = ReadTag(); // read Mixed-in type (part 1).
- if (type_tag == kSomething) {
- SkipDartType(); // read Mixed-in type (part 2).
- }
- SkipListOfDartTypes(); // read implemented_classes.
-}
-
-void StreamingFlowGraphBuilder::ReadClassUntilTypeParameters() {
- Tag class_tag = ReadTag();
- ASSERT(class_tag == kClass);
- SkipCanonicalNameReference(); // read canonical_name.
- ReadPosition(); // read position.
- ReadBool(); // read is_abstract.
- SkipStringReference(); // read name index.
- ReadUInt(); // read source_uri_index.
- SkipListOfExpressions(); // read annotations.
-}
-
-intptr_t StreamingFlowGraphBuilder::ReadConstructorUntilFunctionNode() {
- Tag tag = ReadTag();
- ASSERT(tag == kConstructor);
- SkipCanonicalNameReference(); // read canonical name reference.
- ReadPosition(); // read position.
- ReadPosition(); // read end position.
- ReadFlags(); // read flags.
- intptr_t parent_offset = ReadUInt(); // parent class binary offset.
- SkipName(); // read name.
- SkipListOfExpressions(); // read annotations.
- return parent_offset;
-}
-
-Tag StreamingFlowGraphBuilder::ReadProcedureUntilFunctionNode(
- word* kind,
- intptr_t* parent_offset) {
- Tag tag = ReadTag(); // read tag.
- ASSERT(tag == kProcedure);
- SkipCanonicalNameReference(); // read canonical name reference.
- ReadPosition(); // read position.
- ReadPosition(); // read end position.
- *kind = ReadByte(); // read kind.
- ReadFlags(); // read flags.
- *parent_offset = ReadUInt(); // read parent class binary offset.
- SkipName(); // read name,
- ReadUInt(); // read source_uri_index.
- SkipListOfExpressions(); // read annotations.
- return ReadTag(); // read tag for optional function node.
-}
-
-void StreamingFlowGraphBuilder::ReadFieldUntilAnnotation(
- NameIndex* canonical_name,
- TokenPosition* position,
- TokenPosition* end_position,
- word* flags,
- intptr_t* parent_offset) {
- Tag tag = ReadTag();
- ASSERT(tag == kField);
-
- *canonical_name = ReadCanonicalNameReference(); // read canonical_name.
- *position = ReadPosition(); // read position.
- *end_position = ReadPosition(); // read end position.
- *flags = ReadFlags(); // read flags.
- *parent_offset = ReadUInt(); // read parent class binary offset.
- SkipName(); // read name.
- ReadUInt(); // source_uri_index.
-}
-
void StreamingFlowGraphBuilder::GetTypeParameterInfoForPossibleProcedure(
intptr_t outermost_kernel_offset,
bool* member_is_procedure,
@@ -2650,19 +2543,16 @@ void StreamingFlowGraphBuilder::GetTypeParameterInfoForPossibleProcedure(
if (tag == kProcedure) {
*member_is_procedure = true;
- word kind;
- tag = ReadProcedureUntilFunctionNode(
- &kind, &unused_intptr); // read first part of procedure.
- *is_factory_procedure =
- static_cast<Procedure::ProcedureKind>(kind) == Procedure::kFactory;
+ ProcedureHelper procedure_helper(this);
+ procedure_helper.ReadUntilExcluding(ProcedureHelper::kFunction);
+ *is_factory_procedure = procedure_helper.kind_ == Procedure::kFactory;
+ if (ReadTag() == kSomething) {
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kTypeParameters);
- if (tag == kSomething) {
- ReadFunctionNodeUntilTypeParameters(
- &unused_tokenposition, &unused_tokenposition, &unused_word,
- &unused_word); // read first part of function node.
-
- intptr_t list_length =
- ReadListLength(); // read type_parameters list length.
+ // read type_parameters list length.
+ intptr_t list_length = ReadListLength();
if (list_length > 0) {
*member_type_parameters = list_length;
*member_type_parameters_offset_start = ReaderOffset();
@@ -2672,34 +2562,21 @@ void StreamingFlowGraphBuilder::GetTypeParameterInfoForPossibleProcedure(
}
}
-void StreamingFlowGraphBuilder::ReadFunctionNodeUntilTypeParameters(
- TokenPosition* position,
- TokenPosition* end_position,
- word* async_marker,
- word* dart_async_marker) {
- Tag tag = ReadTag(); // read tag.
- ASSERT(tag == kFunctionNode);
-
- *position = ReadPosition(); // read position.
- *end_position = ReadPosition(); // read end position.
- *async_marker = ReadByte(); // read async marker.
- *dart_async_marker = ReadByte(); // read dart async marker.
-}
-
intptr_t StreamingFlowGraphBuilder::ReadUntilFunctionNode() {
const Tag tag = PeekTag();
if (tag == kProcedure) {
- Tag has_function_node = ReadProcedureUntilFunctionNode(
- &unused_word, &unused_intptr); // read first part of procedure.
- if (has_function_node == kNothing) {
+ ProcedureHelper procedure_helper(this);
+ procedure_helper.ReadUntilExcluding(ProcedureHelper::kFunction);
+ if (ReadTag() == kNothing) { // read function node tag.
// Running a procedure without a function node doesn't make sense.
UNREACHABLE();
}
return -1;
// Now at start of FunctionNode.
} else if (tag == kConstructor) {
- // read first part of constructor.
- return ReadConstructorUntilFunctionNode();
+ ConstructorHelper constructor_helper(this);
+ constructor_helper.ReadUntilExcluding(ConstructorHelper::kFunction);
+ return constructor_helper.parent_class_binary_offset_;
// Now at start of FunctionNode.
// Notice that we also have a list of initializers after that!
} else if (tag == kFunctionNode) {
@@ -2714,24 +2591,16 @@ StringIndex StreamingFlowGraphBuilder::GetNameFromVariableDeclaration(
intptr_t kernel_offset) {
// Temporarily go to the variable declaration, read the name.
AlternativeReadingScope alt(reader_, kernel_offset);
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- ReadFlags(); // read flags.
- return ReadStringReference(); // read name index.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilIncluding(VariableDeclarationHelper::kNameIndex);
+ return helper.name_index_;
}
FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfStaticFieldInitializer() {
- TokenPosition position;
- TokenPosition end_position;
- word flags;
- ReadFieldUntilAnnotation(&unused_nameindex, &position, &end_position, &flags,
- &unused_intptr);
- bool is_static = (flags & Field::kFlagStatic) == Field::kFlagStatic;
- bool is_const = (flags & Field::kFlagConst) == Field::kFlagConst;
- ASSERT(is_static);
-
- SkipListOfExpressions(); // read annotations.
- SkipDartType(); // read type.
+ FieldHelper field_helper(this);
+ field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
+ ASSERT(field_helper.IsStatic());
+
Tag initializer_tag = ReadTag(); // read first part of initializer.
if (initializer_tag != kSomething) {
UNREACHABLE();
@@ -2743,7 +2612,7 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfStaticFieldInitializer() {
Fragment body(normal_entry);
body += flow_graph_builder_->CheckStackOverflowInPrologue();
- if (is_const) {
+ if (field_helper.IsConst()) {
// this will (potentially) read the initializer, but reset the position.
body += Constant(constant_evaluator_.EvaluateExpression(ReaderOffset()));
SkipExpression(); // read the initializer.
@@ -2759,19 +2628,15 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfStaticFieldInitializer() {
FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFieldAccessor(
LocalVariable* setter_value) {
- NameIndex canonical_name;
- ReadFieldUntilAnnotation(&canonical_name, &unused_tokenposition,
- &unused_tokenposition, &unused_word, &unused_intptr);
- SkipListOfExpressions(); // read annotations.
- SkipDartType(); // read type.
- Tag initializer_tag = ReadTag(); // read first part of initializer.
+ FieldHelper field_helper(this);
+ field_helper.ReadUntilIncluding(FieldHelper::kCanonicalName);
const Function& function = parsed_function()->function();
bool is_setter = function.IsImplicitSetterFunction();
bool is_method = !function.IsStaticFunction();
- dart::Field& field =
- dart::Field::ZoneHandle(Z, H.LookupFieldByKernelField(canonical_name));
+ dart::Field& field = dart::Field::ZoneHandle(
+ Z, H.LookupFieldByKernelField(field_helper.canonical_name_));
TargetEntryInstr* normal_entry = flow_graph_builder_->BuildTargetEntry();
flow_graph_builder_->graph_entry_ = new (Z) GraphEntryInstr(
@@ -2792,6 +2657,9 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFieldAccessor(
body += LoadLocal(scopes()->this_variable);
body += flow_graph_builder_->LoadField(field);
} else if (field.is_const()) {
+ field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
+ Tag initializer_tag = ReadTag(); // read first part of initializer.
+
// If the parser needs to know the value of an uninitialized constant field
// it will set the value to the transition sentinel (used to detect circular
// initialization) and then call the implicit getter. Thus, the getter
@@ -2799,9 +2667,7 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFieldAccessor(
// contain because it would detect spurious circular initialization when it
// checks for the transition sentinel.
ASSERT(initializer_tag == kSomething);
- // this will (potentially) read the initializer, but reset the position.
body += Constant(constant_evaluator_.EvaluateExpression(ReaderOffset()));
- SkipExpression(); // read the initializer.
} else {
// The field always has an initializer because static fields without
// initializers are initialized eagerly and do not have implicit getters.
@@ -2826,12 +2692,9 @@ void StreamingFlowGraphBuilder::SetupDefaultParameterValues() {
new ZoneGrowableArray<const Instance*>(Z, num_optional_parameters);
AlternativeReadingScope alt(reader_);
- ReadFunctionNodeUntilTypeParameters(
- &unused_tokenposition, &unused_tokenposition, &unused_word,
- &unused_word); // read first part of function node.
- SkipTypeParametersList(); // read type_parameters.
- ReadUInt(); // read total parameter count.
- intptr_t required = ReadUInt(); // read required_parameter_count.
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
if (parsed_function()->function().HasOptionalNamedParameters()) {
// List of positional.
@@ -2848,11 +2711,8 @@ void StreamingFlowGraphBuilder::SetupDefaultParameterValues() {
Instance* default_value;
// Read ith variable declaration
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- ReadFlags(); // read flags.
- SkipStringReference(); // read name index.
- SkipDartType(); // read type.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
Tag tag = ReadTag(); // read (first part of) initializer.
if (tag == kSomething) {
// this will (potentially) read the initializer,
@@ -2868,20 +2728,19 @@ void StreamingFlowGraphBuilder::SetupDefaultParameterValues() {
} else {
// List of positional.
intptr_t list_length = ReadListLength(); // read list length.
- ASSERT(list_length == required + num_optional_parameters);
+ ASSERT(list_length == function_node_helper.required_parameter_count_ +
+ num_optional_parameters);
ASSERT(parsed_function()->function().HasOptionalPositionalParameters());
- for (intptr_t i = 0; i < required; ++i) {
+ for (intptr_t i = 0; i < function_node_helper.required_parameter_count_;
+ ++i) {
SkipVariableDeclaration(); // read ith variable declaration.
}
for (intptr_t i = 0; i < num_optional_parameters; ++i) {
Instance* default_value;
// Read ith variable declaration
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- ReadFlags(); // read flags.
- SkipStringReference(); // read name index.
- SkipDartType(); // read type.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
Tag tag = ReadTag(); // read (first part of) initializer.
if (tag == kSomething) {
// this will (potentially) read the initializer,
@@ -2930,25 +2789,19 @@ Fragment StreamingFlowGraphBuilder::BuildInitializers(
// }
{
AlternativeReadingScope alt(reader_, constructor_class_parent_offset);
- ReadClassUntilFields(); // read first part of class.
+ ClassHelper class_helper(this);
+ class_helper.ReadUntilExcluding(ClassHelper::kFields);
intptr_t list_length = ReadListLength(); // read fields list length.
for (intptr_t i = 0; i < list_length; ++i) {
intptr_t field_offset = ReaderOffset();
- NameIndex canonical_name;
- TokenPosition position;
- TokenPosition end_position;
- word flags;
- ReadFieldUntilAnnotation(&canonical_name, &position, &end_position,
- &flags, &unused_intptr);
- bool is_static = (flags & Field::kFlagStatic) == Field::kFlagStatic;
- SkipListOfExpressions(); // read annotations.
- SkipDartType(); // read type.
+ FieldHelper field_helper(this);
+ field_helper.ReadUntilExcluding(FieldHelper::kInitializer);
Tag initializer_tag = ReadTag(); // read first part of initializer.
- if (!is_static && initializer_tag == kSomething) {
+ if (!field_helper.IsStatic() && initializer_tag == kSomething) {
EnterScope(field_offset);
- instructions +=
- BuildFieldInitializer(canonical_name); // read initializer.
+ instructions += BuildFieldInitializer(
+ field_helper.canonical_name_); // read initializer.
ExitScope(field_offset);
} else if (initializer_tag == kSomething) {
SkipExpression(); // read initializer.
@@ -3046,13 +2899,9 @@ Fragment StreamingFlowGraphBuilder::BuildInitializers(
LocalVariable* variable = LookupVariable(ReaderOffset());
// Variable declaration
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- word flags = ReadFlags(); // read flags.
- ASSERT((flags & VariableDeclaration::kFlagConst) !=
- VariableDeclaration::kFlagConst);
- SkipStringReference(); // read name index.
- SkipDartType(); // read type.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
+ ASSERT(!helper.IsConst());
Tag tag = ReadTag(); // read (first part of) initializer.
if (tag != kSomething) {
UNREACHABLE();
@@ -3092,13 +2941,9 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfImplicitClosureFunction(
body += PushArgument();
}
- TokenPosition end_position;
- ReadFunctionNodeUntilTypeParameters(
- &unused_tokenposition, &end_position, &unused_word,
- &unused_word); // read first part of function node.
- SkipTypeParametersList(); // read type parameter list.
- ReadUInt(); // read total parameter count.
- ReadUInt(); // read required_parameter_count.
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
// Positional.
intptr_t positional_argument_count = ReadListLength();
@@ -3114,11 +2959,11 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfImplicitClosureFunction(
if (named_argument_count > 0) {
argument_names = Array::New(named_argument_count);
for (intptr_t i = 0; i < named_argument_count; ++i) {
- body +=
- LoadLocal(LookupVariable(ReaderOffset())); // ith variable offset.
+ // ith variable offset.
+ body += LoadLocal(LookupVariable(ReaderOffset()));
body += PushArgument();
- argument_names.SetAt(
- i, H.DartSymbol(GetNameFromVariableDeclaration(ReaderOffset())));
+ StringIndex name = GetNameFromVariableDeclaration(ReaderOffset());
+ argument_names.SetAt(i, H.DartSymbol(name));
SkipVariableDeclaration(); // read ith variable.
}
}
@@ -3130,7 +2975,7 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfImplicitClosureFunction(
argument_names);
// Return the result.
- body += Return(end_position);
+ body += Return(function_node_helper.end_position_);
return new (Z)
FlowGraph(*parsed_function(), flow_graph_builder_->graph_entry_,
@@ -3204,13 +3049,9 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFunction(
body += BuildInitializers(constructor_class_parent_offset);
}
- TokenPosition position;
- ReadFunctionNodeUntilTypeParameters(
- &position, &unused_tokenposition, &unused_word,
- &unused_word); // read first part of function node.
- SkipTypeParametersList(); // read type parameter list.
- ReadUInt(); // read total parameter count
- ReadUInt(); // read required_parameter_count.
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
intptr_t first_parameter_offset = -1;
{
AlternativeReadingScope alt(reader_);
@@ -3259,8 +3100,8 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFunction(
// Positional.
intptr_t list_length = ReadListLength();
for (intptr_t i = 0; i < list_length; ++i) {
- body +=
- LoadLocal(LookupVariable(ReaderOffset())); // ith variable offset.
+ // ith variable offset.
+ body += LoadLocal(LookupVariable(ReaderOffset()));
body += CheckVariableTypeInCheckedMode(ReaderOffset());
body += Drop();
SkipVariableDeclaration(); // read ith variable.
@@ -3269,19 +3110,17 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFunction(
// Named.
list_length = ReadListLength();
for (intptr_t i = 0; i < list_length; ++i) {
- body +=
- LoadLocal(LookupVariable(ReaderOffset())); // ith variable offset.
+ // ith variable offset.
+ body += LoadLocal(LookupVariable(ReaderOffset()));
body += CheckVariableTypeInCheckedMode(ReaderOffset());
body += Drop();
SkipVariableDeclaration(); // read ith variable.
}
- } else {
- // Still skip past the parameters.
- SkipListOfVariableDeclarations(); // read list of positionals.
- SkipListOfVariableDeclarations(); // read list of named.
+
+ function_node_helper.SetJustRead(FunctionNodeHelper::kNamedParameters);
}
- SkipDartType(); // read return type.
+ function_node_helper.ReadUntilExcluding(FunctionNodeHelper::kBody);
if (FLAG_causal_async_stacks &&
(dart_function.IsAsyncFunction() || dart_function.IsAsyncGenerator())) {
@@ -3432,10 +3271,9 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFunction(
flow_graph_builder_->context_depth_ = current_context_depth;
}
- if (NeedsDebugStepCheck(dart_function, position)) {
+ if (NeedsDebugStepCheck(dart_function, function_node_helper.position_)) {
const intptr_t current_context_depth = flow_graph_builder_->context_depth_;
flow_graph_builder_->context_depth_ = 0;
-
// If a switch was added above: Start the switch by injecting a debuggable
// safepoint so stepping over an await works.
// If not, still start the body with a debuggable safepoint to ensure
@@ -3452,7 +3290,7 @@ FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfFunction(
}
if (!check_pos.IsDebugPause()) {
// No parameters or synthetic parameters.
- check_pos = position;
+ check_pos = function_node_helper.position_;
ASSERT(check_pos.IsDebugPause());
}
@@ -4253,24 +4091,8 @@ void StreamingFlowGraphBuilder::SkipStatement() {
}
void StreamingFlowGraphBuilder::SkipFunctionNode() {
- Tag tag = ReadTag(); // read tag.
- ASSERT(tag == kFunctionNode);
-
- ReadPosition(); // read position.
- ReadPosition(); // read end position.
- ReadByte(); // read async marker.
- ReadByte(); // read dart async marker.
- SkipTypeParametersList(); // read type_parameters.
- ReadUInt(); // read total parameter count.
- ReadUInt(); // read required_parameter_count.
-
- SkipListOfVariableDeclarations(); // read list of positionals.
- SkipListOfVariableDeclarations(); // read list of named.
- SkipDartType(); // read return type.
-
- if (ReadTag() == kSomething) {
- SkipStatement(); // Read body
- }
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(FunctionNodeHelper::kEnd);
}
void StreamingFlowGraphBuilder::SkipName() {
@@ -4295,15 +4117,8 @@ void StreamingFlowGraphBuilder::SkipArguments() {
}
void StreamingFlowGraphBuilder::SkipVariableDeclaration() {
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- ReadFlags(); // read flags.
- SkipStringReference(); // read name index.
- SkipDartType(); // read type.
- Tag tag = ReadTag(); // read (first part of) initializer.
- if (tag == kSomething) {
- SkipExpression(); // read (actual) initializer.
- }
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kEnd);
}
TokenPosition StreamingFlowGraphBuilder::ReadPosition(bool record) {
@@ -6201,7 +6016,7 @@ Fragment StreamingFlowGraphBuilder::BuildSwitchStatement() {
// * `case e1: case e2: body`
Fragment* body_fragments = new Fragment[num_cases];
intptr_t* case_expression_offsets = new intptr_t[num_cases];
- bool* case_is_default = new bool[num_cases];
+ int default_case = -1;
for (intptr_t i = 0; i < num_cases; ++i) {
case_expression_offsets[i] = ReaderOffset();
@@ -6211,7 +6026,7 @@ Fragment StreamingFlowGraphBuilder::BuildSwitchStatement() {
SkipExpression(); // read jth expression.
}
bool is_default = ReadBool(); // read is_default.
- case_is_default[i] = is_default;
+ if (is_default) default_case = i;
Fragment& body_fragment = body_fragments[i] =
BuildStatement(); // read body.
@@ -6285,7 +6100,7 @@ Fragment StreamingFlowGraphBuilder::BuildSwitchStatement() {
SetOffset(case_expression_offsets[i]);
int num_expressions = ReadListLength(); // read length of expressions.
- if (case_is_default[i]) {
+ if (i == default_case) {
ASSERT(i == (num_cases - 1));
// Evaluate the conditions for the default [SwitchCase] just for the
@@ -6351,8 +6166,7 @@ Fragment StreamingFlowGraphBuilder::BuildSwitchStatement() {
}
}
- bool has_no_default = num_cases > 0 && !case_is_default[num_cases - 1];
- if (has_no_default) {
+ if (num_cases > 0 && default_case < 0) {
// There is no default, which means we have an open [current_instructions]
// (which is a [TargetEntryInstruction] for the last "otherwise" branch).
//
@@ -6377,6 +6191,7 @@ Fragment StreamingFlowGraphBuilder::BuildSwitchStatement() {
}
delete[] body_fragments;
+ delete[] case_expression_offsets;
SetOffset(end_offset);
return Fragment(head_instructions.entry, current_instructions.current);
@@ -6748,10 +6563,9 @@ Fragment StreamingFlowGraphBuilder::BuildVariableDeclaration() {
intptr_t kernel_position_no_tag = ReaderOffset();
LocalVariable* variable = LookupVariable(kernel_position_no_tag);
- TokenPosition position = ReadPosition(); // read position.
- TokenPosition equals_position = ReadPosition(); // read equals position.
- word flags = ReadFlags(); // read flags.
- dart::String& name = H.DartSymbol(ReadStringReference()); // read name index.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kType);
+ dart::String& name = H.DartSymbol(helper.name_index_);
AbstractType& type = T.BuildType(); // read type.
Tag tag = ReadTag(); // read (first part of) initializer.
@@ -6759,9 +6573,7 @@ Fragment StreamingFlowGraphBuilder::BuildVariableDeclaration() {
if (tag == kNothing) {
instructions += NullConstant();
} else {
- if ((flags & VariableDeclaration::kFlagConst) ==
- VariableDeclaration::kFlagConst) {
- // Const!
+ if (helper.IsConst()) {
const Instance& constant_value = constant_evaluator_.EvaluateExpression(
ReaderOffset()); // read initializer form current position.
variable->SetConstValue(constant_value);
@@ -6776,11 +6588,12 @@ Fragment StreamingFlowGraphBuilder::BuildVariableDeclaration() {
// Use position of equal sign if it exists. If the equal sign does not exist
// use the position of the identifier.
- TokenPosition debug_position = Utils::Maximum(position, equals_position);
+ TokenPosition debug_position =
+ Utils::Maximum(helper.position_, helper.equals_position_);
if (NeedsDebugStepCheck(stack(), debug_position)) {
instructions = DebugStepCheck(debug_position) + instructions;
}
- instructions += StoreLocal(position, variable);
+ instructions += StoreLocal(helper.position_, variable);
instructions += Drop();
return instructions;
}
@@ -6805,17 +6618,10 @@ Fragment StreamingFlowGraphBuilder::BuildFunctionNode(
intptr_t variable_offeset) {
intptr_t offset = ReaderOffset();
- TokenPosition position;
- TokenPosition end_position;
- word async_marker_word;
- word dart_async_marker_word;
- ReadFunctionNodeUntilTypeParameters(
- &position, &end_position, &async_marker_word,
- &dart_async_marker_word); // read first part of function node.
- FunctionNode::AsyncMarker async_marker =
- static_cast<FunctionNode::AsyncMarker>(async_marker_word);
- FunctionNode::AsyncMarker dart_async_marker =
- static_cast<FunctionNode::AsyncMarker>(dart_async_marker_word);
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kTotalParameterCount);
+ TokenPosition position = function_node_helper.position_;
if (declaration) {
position = parent_position;
@@ -6827,12 +6633,9 @@ Fragment StreamingFlowGraphBuilder::BuildFunctionNode(
position = TokenPosition(offset).ToSynthetic();
}
- SkipTypeParametersList(); // read type parameters.
-
// The VM has a per-isolate table of functions indexed by the enclosing
// function and token position.
Function& function = Function::ZoneHandle(Z);
- bool read_rest_of_function_node = false;
// NOTE: This is not TokenPosition in the general sense!
function = I->LookupClosureFunction(parsed_function()->function(), position);
@@ -6852,8 +6655,9 @@ Fragment StreamingFlowGraphBuilder::BuildFunctionNode(
function = Function::NewClosureFunction(
*name, parsed_function()->function(), position);
- function.set_is_debuggable(dart_async_marker == FunctionNode::kSync);
- switch (dart_async_marker) {
+ function.set_is_debuggable(function_node_helper.dart_async_marker_ ==
+ FunctionNode::kSync);
+ switch (function_node_helper.dart_async_marker_) {
case FunctionNode::kSyncStar:
function.set_modifier(RawFunction::kSyncGen);
break;
@@ -6869,23 +6673,23 @@ Fragment StreamingFlowGraphBuilder::BuildFunctionNode(
// no special modifier
break;
}
- function.set_is_generated_body(async_marker ==
+ function.set_is_generated_body(function_node_helper.async_marker_ ==
FunctionNode::kSyncYielding);
if (function.IsAsyncClosure() || function.IsAsyncGenClosure()) {
function.set_is_inlinable(!FLAG_causal_async_stacks);
}
- function.set_end_token_pos(end_position);
+ function.set_end_token_pos(function_node_helper.end_position_);
LocalScope* scope = scopes()->function_scopes[i].scope;
const ContextScope& context_scope = ContextScope::Handle(
Z, scope->PreserveOuterScope(flow_graph_builder_->context_depth_));
function.set_context_scope(context_scope);
function.set_kernel_offset(offset);
- // Read rest of function node.
SetupFunctionParameters(dart::Class::Handle(Z), function,
false, // is_method
- true); // is_closure
- read_rest_of_function_node = true;
+ true, // is_closure
+ &function_node_helper);
+
// Finalize function type.
Type& signature_type = Type::Handle(Z, function.SignatureType());
signature_type ^=
@@ -6897,16 +6701,7 @@ Fragment StreamingFlowGraphBuilder::BuildFunctionNode(
}
}
- if (!read_rest_of_function_node) {
- ReadUInt(); // read total parameter count.
- ReadUInt(); // read required_parameter_count.
- SkipListOfVariableDeclarations(); // read list of positionals.
- SkipListOfVariableDeclarations(); // read list of named.
- SkipDartType(); // read return type.
- if (ReadTag() == kSomething) { // read first part of body.
- SkipStatement(); // read body.
- }
- }
+ function_node_helper.ReadUntilExcluding(FunctionNodeHelper::kEnd);
const dart::Class& closure_class =
dart::Class::ZoneHandle(Z, I->object_store()->closure_class());
@@ -6946,15 +6741,21 @@ void StreamingFlowGraphBuilder::SetupFunctionParameters(
const dart::Class& klass,
const dart::Function& function,
bool is_method,
- bool is_closure) {
+ bool is_closure,
+ FunctionNodeHelper* function_node_helper) {
ASSERT(!(is_method && is_closure));
bool is_factory = function.IsFactory();
intptr_t extra_parameters = (is_method || is_closure || is_factory) ? 1 : 0;
- intptr_t total_parameter_count = ReadUInt(); // read total parameter count.
+ function_node_helper->ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
+
intptr_t required_parameter_count =
- ReadUInt(); // read required_parameter_count.
+ function_node_helper->required_parameter_count_;
+ intptr_t total_parameter_count = function_node_helper->total_parameter_count_;
+
intptr_t positional_parameters_count = ReadListLength(); // read list length.
+
intptr_t named_parameters_count =
total_parameter_count - positional_parameters_count;
@@ -6989,10 +6790,8 @@ void StreamingFlowGraphBuilder::SetupFunctionParameters(
for (intptr_t i = 0; i < positional_parameters_count; ++i, ++pos) {
// Read ith variable declaration.
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- ReadFlags(); // read flags.
- StringIndex name = ReadStringReference(); // read name index.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kType);
const AbstractType& type = T.BuildTypeWithoutFinalization(); // read type.
Tag tag = ReadTag(); // read (first part of) initializer.
if (tag == kSomething) {
@@ -7001,7 +6800,7 @@ void StreamingFlowGraphBuilder::SetupFunctionParameters(
function.SetParameterTypeAt(
pos, type.IsMalformed() ? Type::dynamic_type() : type);
- function.SetParameterNameAt(pos, H.DartSymbol(name));
+ function.SetParameterNameAt(pos, H.DartSymbol(helper.name_index_));
}
intptr_t named_parameters_count_check =
@@ -7009,10 +6808,8 @@ void StreamingFlowGraphBuilder::SetupFunctionParameters(
ASSERT(named_parameters_count_check == named_parameters_count);
for (intptr_t i = 0; i < named_parameters_count; ++i, ++pos) {
// Read ith variable declaration.
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- ReadFlags(); // read flags.
- StringIndex name = ReadStringReference(); // read name index.
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kType);
const AbstractType& type = T.BuildTypeWithoutFinalization(); // read type.
Tag tag = ReadTag(); // read (first part of) initializer.
if (tag == kSomething) {
@@ -7021,21 +6818,18 @@ void StreamingFlowGraphBuilder::SetupFunctionParameters(
function.SetParameterTypeAt(
pos, type.IsMalformed() ? Type::dynamic_type() : type);
- function.SetParameterNameAt(pos, H.DartSymbol(name));
+ function.SetParameterNameAt(pos, H.DartSymbol(helper.name_index_));
}
+ function_node_helper->SetJustRead(FunctionNodeHelper::kNamedParameters);
+
// The result type for generative constructors has already been set.
if (!function.IsGenerativeConstructor()) {
const AbstractType& return_type =
T.BuildTypeWithoutFinalization(); // read return type.
function.set_result_type(return_type.IsMalformed() ? Type::dynamic_type()
: return_type);
- } else {
- SkipDartType(); // read return type.
- }
-
- if (ReadTag() == kSomething) { // read first part of body.
- SkipStatement(); // read body.
+ function_node_helper->SetJustRead(FunctionNodeHelper::kReturnType);
}
}
@@ -7043,13 +6837,10 @@ RawObject* StreamingFlowGraphBuilder::BuildParameterDescriptor(
intptr_t kernel_offset) {
SetOffset(kernel_offset);
ReadUntilFunctionNode(); // read until function node.
- ReadFunctionNodeUntilTypeParameters(
- &unused_tokenposition, &unused_tokenposition, &unused_word,
- &unused_word); // read first part of function node.
- SkipTypeParametersList(); // read type_parameters.
-
- intptr_t param_count = ReadUInt(); // read total parameter count.
- ReadUInt(); // read required_parameter_count.
+ FunctionNodeHelper function_node_helper(this);
+ function_node_helper.ReadUntilExcluding(
+ FunctionNodeHelper::kPositionalParameters);
+ intptr_t param_count = function_node_helper.total_parameter_count_;
intptr_t positional_count = ReadListLength(); // read list length.
intptr_t named_parameters_count = param_count - positional_count;
@@ -7065,16 +6856,11 @@ RawObject* StreamingFlowGraphBuilder::BuildParameterDescriptor(
}
// Read ith variable declaration.
- ReadPosition(); // read position.
- ReadPosition(); // read equals position.
- word flags = ReadFlags(); // read flags.
- bool is_final = (flags & VariableDeclaration::kFlagFinal) ==
- VariableDeclaration::kFlagFinal;
+ VariableDeclarationHelper helper(this);
+ helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
param_descriptor.SetAt(entry_start + Parser::kParameterIsFinalOffset,
- is_final ? Bool::True() : Bool::False());
+ helper.IsFinal() ? Bool::True() : Bool::False());
- SkipStringReference(); // read name index.
- SkipDartType(); // read type.
Tag tag = ReadTag(); // read (first part of) initializer.
if (tag == kSomething) {
// this will (potentially) read the initializer, but reset the position.
@@ -7100,41 +6886,17 @@ RawObject* StreamingFlowGraphBuilder::EvaluateMetadata(intptr_t kernel_offset) {
const Tag tag = PeekTag();
if (tag == kClass) {
- Tag tag = ReadTag(); // read tag.
- ASSERT(tag == kClass);
- SkipCanonicalNameReference(); // read canonical name reference.
- ReadPosition(); // read position.
- ReadByte(); // read is_abstract
- SkipStringReference(); // read name_index.
- ReadUInt(); // read source_uri_index.
- // SkipListOfExpressions(); // read annotations.
+ ClassHelper class_helper(this);
+ class_helper.ReadUntilExcluding(ClassHelper::kAnnotations);
} else if (tag == kProcedure) {
- Tag tag = ReadTag(); // read tag.
- ASSERT(tag == kProcedure);
- SkipCanonicalNameReference(); // read canonical name reference.
- ReadPosition(); // read position.
- ReadPosition(); // read end position.
- ReadByte(); // read kind.
- ReadFlags(); // read flags.
- ReadUInt(); // read parent class binary offset.
- SkipName(); // read name,
- ReadUInt(); // read source_uri_index.
- // SkipListOfExpressions(); // read annotations.
+ ProcedureHelper procedure_helper(this);
+ procedure_helper.ReadUntilExcluding(ProcedureHelper::kAnnotations);
} else if (tag == kField) {
- ReadFieldUntilAnnotation(&unused_nameindex, &unused_tokenposition,
- &unused_tokenposition, &unused_word,
- &unused_intptr);
- // SkipListOfExpressions(); // read annotations.
+ FieldHelper field_helper(this);
+ field_helper.ReadUntilExcluding(FieldHelper::kAnnotations);
} else if (tag == kConstructor) {
- Tag tag = ReadTag();
- ASSERT(tag == kConstructor);
- SkipCanonicalNameReference(); // read canonical name reference.
- ReadPosition(); // read position.
- ReadPosition(); // read end position.
- ReadFlags(); // read flags.
- ReadUInt(); // parent class binary offset.
- SkipName(); // read name.
- // SkipListOfExpressions(); // read annotations.
+ ConstructorHelper constructor_helper(this);
+ constructor_helper.ReadUntilExcluding(ConstructorHelper::kAnnotations);
} else {
FATAL("No support for metadata on this type of kernel node\n");
}
« no previous file with comments | « runtime/vm/kernel_binary_flowgraph.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698