languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 00:29:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dart2js] Make _ConstantNodeIndexerVisitor DAG-aware

Browse source 
Change-Id: Ie0dc25ef90805fd05e65c738bb010361e7ec9590
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110186
Reviewed-by: Mark Zhou <markzipan@google.com>
Commit-Queue: Stephen Adams <sra@google.com>
This commit is contained in:
Stephen Adams 2019-07-24 01:19:32 +00:00 committed by commit-bot@chromium.org
parent 6ccfb4bab1
commit d767363950
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkg/compiler/lib/src/serialization/node_indexer.dart
View file

@ -210,11 +210,16 @@ class _ConstantNodeIndexerVisitor implements ir.ConstantVisitor<void> {
int _currentIndex = 0;
final Map<int, ir.Constant> _indexToNodeMap = {};
final Map<ir.Constant, int> _nodeToIndexMap = {};
final Set<ir.Constant> _visitedNonindexedNodes = {};
void registerConstant(ir.Constant node) {
/// Returns `true` if node not already registered.
bool _register(ir.Constant node) {
int index = _nodeToIndexMap[node];
if (index != null) return false;
_indexToNodeMap[_currentIndex] = node;
_nodeToIndexMap[node] = _currentIndex;
_currentIndex++;
return true;
}
int getIndex(ir.Constant node) {
@ -244,33 +249,38 @@ class _ConstantNodeIndexerVisitor implements ir.ConstantVisitor<void> {
@override
void visitInstanceConstant(ir.InstanceConstant node) {
node.fieldValues.forEach((_, ir.Constant value) {
value.accept(this);
});
if (_visitedNonindexedNodes.add(node)) {
node.fieldValues.forEach((_, ir.Constant value) {
value.accept(this);
});
}
}
@override
void visitSetConstant(ir.SetConstant node) {
registerConstant(node);
for (ir.Constant element in node.entries) {
element.accept(this);
if (_register(node)) {
for (ir.Constant element in node.entries) {
element.accept(this);
}
}
}
@override
void visitListConstant(ir.ListConstant node) {
registerConstant(node);
for (ir.Constant element in node.entries) {
element.accept(this);
if (_register(node)) {
for (ir.Constant element in node.entries) {
element.accept(this);
}
}
}
@override
void visitMapConstant(ir.MapConstant node) {
registerConstant(node);
for (ir.ConstantMapEntry entry in node.entries) {
entry.key.accept(this);
entry.value.accept(this);
if (_register(node)) {
for (ir.ConstantMapEntry entry in node.entries) {
entry.key.accept(this);
entry.value.accept(this);
}
}
}