Index: tests/compiler/dart2js/sourcemaps/js_tracer.dart |
diff --git a/tests/compiler/dart2js/sourcemaps/js_tracer.dart b/tests/compiler/dart2js/sourcemaps/js_tracer.dart |
index 1aa40fec21b3f570fe437b07787e035c10fb1b56..4ea4e91a7f7dbeec83c80705239fddc960e7bac0 100644 |
--- a/tests/compiler/dart2js/sourcemaps/js_tracer.dart |
+++ b/tests/compiler/dart2js/sourcemaps/js_tracer.dart |
@@ -22,7 +22,8 @@ TraceGraph createTraceGraph(SourceMapInfo info, Coverage coverage) { |
return graph; |
} |
-class StepTraceListener extends TraceListener { |
+class StepTraceListener extends TraceListener |
+ with NodeToSourceInformationMixin { |
Map<js.Node, TraceStep> steppableMap = <js.Node, TraceStep>{}; |
final TraceGraph graph; |
@@ -30,7 +31,7 @@ class StepTraceListener extends TraceListener { |
@override |
void onStep(js.Node node, Offset offset, StepKind kind) { |
- SourceInformation sourceInformation = node.sourceInformation; |
+ SourceInformation sourceInformation = computeSourceInformation(node); |
SourcePositionKind sourcePositionKind = SourcePositionKind.START; |
List text = [node]; |
switch (kind) { |
@@ -81,14 +82,16 @@ class StepTraceListener extends TraceListener { |
} |
createTraceStep( |
+ kind, |
node, |
offset: offset, |
sourceLocation: getSourceLocation( |
- node.sourceInformation, sourcePositionKind), |
+ sourceInformation, sourcePositionKind), |
text: text); |
} |
void createTraceStep( |
+ StepKind kind, |
js.Node node, |
{Offset offset, |
List text, |
@@ -101,9 +104,12 @@ class StepTraceListener extends TraceListener { |
} |
TraceStep step = new TraceStep( |
- id, node, |
+ kind, |
+ id, |
+ node, |
offset, |
- text, sourceLocation); |
+ text, |
+ sourceLocation); |
graph.addStep(step); |
steppableMap[node] = step; |