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

Unified Diff: pkg/compiler/lib/src/ssa/variable_allocator.dart

Issue 1859343004: dartfmt pkg/compiler (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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 | « pkg/compiler/lib/src/ssa/value_set.dart ('k') | pkg/compiler/lib/src/string_validator.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/variable_allocator.dart
diff --git a/pkg/compiler/lib/src/ssa/variable_allocator.dart b/pkg/compiler/lib/src/ssa/variable_allocator.dart
index 280a047e82e97c865fb361894b259e5b84d1fcc9..2145d6d17faf8ee0fa3d6f37210663c239909cdb 100644
--- a/pkg/compiler/lib/src/ssa/variable_allocator.dart
+++ b/pkg/compiler/lib/src/ssa/variable_allocator.dart
@@ -115,8 +115,8 @@ class LiveEnvironment {
final Map<HInstruction, LiveInterval> liveIntervals;
LiveEnvironment(this.liveIntervals, this.endId)
- : liveInstructions = new Map<HInstruction, int>(),
- loopMarkers = new Map<HBasicBlock, int>();
+ : liveInstructions = new Map<HInstruction, int>(),
+ loopMarkers = new Map<HBasicBlock, int>();
/**
* Remove an instruction from the liveIn set. This method also
@@ -124,8 +124,8 @@ class LiveEnvironment {
* range: [id, / id contained in [liveInstructions] /].
*/
void remove(HInstruction instruction, int id) {
- LiveInterval interval = liveIntervals.putIfAbsent(
- instruction, () => new LiveInterval());
+ LiveInterval interval =
+ liveIntervals.putIfAbsent(instruction, () => new LiveInterval());
int lastId = liveInstructions[instruction];
// If [lastId] is null, then this instruction is not being used.
interval.add(new LiveRange(id, lastId == null ? id : lastId));
@@ -156,12 +156,14 @@ class LiveEnvironment {
// else block have the same end id for an instruction that is
// being used in the join block and defined before the if/else.
if (existingId == endId) return;
- LiveInterval range = liveIntervals.putIfAbsent(
- instruction, () => new LiveInterval());
+ LiveInterval range =
+ liveIntervals.putIfAbsent(instruction, () => new LiveInterval());
range.add(new LiveRange(other.startId, existingId));
liveInstructions[instruction] = endId;
});
- other.loopMarkers.forEach((k, v) { loopMarkers[k] = v; });
+ other.loopMarkers.forEach((k, v) {
+ loopMarkers[k] = v;
+ });
}
void addLoopMarker(HBasicBlock header, int id) {
@@ -210,8 +212,8 @@ class SsaLiveIntervalBuilder extends HBaseVisitor {
SsaLiveIntervalBuilder(
this.compiler, this.generateAtUseSite, this.controlFlowOperators)
- : liveInstructions = new Map<HBasicBlock, LiveEnvironment>(),
- liveIntervals = new Map<HInstruction, LiveInterval>();
+ : liveInstructions = new Map<HBasicBlock, LiveEnvironment>(),
+ liveIntervals = new Map<HInstruction, LiveInterval>();
DiagnosticReporter get reporter => compiler.reporter;
@@ -222,8 +224,8 @@ class SsaLiveIntervalBuilder extends HBaseVisitor {
}
}
- void markInputsAsLiveInEnvironment(HInstruction instruction,
- LiveEnvironment environment) {
+ void markInputsAsLiveInEnvironment(
+ HInstruction instruction, LiveEnvironment environment) {
for (int i = 0, len = instruction.inputs.length; i < len; i++) {
markAsLiveInEnvironment(instruction.inputs[i], environment);
}
@@ -255,8 +257,8 @@ class SsaLiveIntervalBuilder extends HBaseVisitor {
return checked;
}
- void markAsLiveInEnvironment(HInstruction instruction,
- LiveEnvironment environment) {
+ void markAsLiveInEnvironment(
+ HInstruction instruction, LiveEnvironment environment) {
if (generateAtUseSite.contains(instruction)) {
markInputsAsLiveInEnvironment(instruction, environment);
} else {
@@ -274,8 +276,8 @@ class SsaLiveIntervalBuilder extends HBaseVisitor {
}
}
- void removeFromEnvironment(HInstruction instruction,
- LiveEnvironment environment) {
+ void removeFromEnvironment(
+ HInstruction instruction, LiveEnvironment environment) {
environment.remove(instruction, instructionId);
// Special case the HCheck instruction to have the same live
// interval as the instruction it is checking.
@@ -365,8 +367,8 @@ class SsaLiveIntervalBuilder extends HBaseVisitor {
// Update all instructions that are liveIns in [header] to have a
// range that covers the loop.
env.liveInstructions.forEach((HInstruction instruction, int id) {
- LiveInterval range = env.liveIntervals.putIfAbsent(
- instruction, () => new LiveInterval());
+ LiveInterval range =
+ env.liveIntervals.putIfAbsent(instruction, () => new LiveInterval());
range.loopUpdate(env.startId, lastId);
env.liveInstructions[instruction] = lastId;
});
@@ -380,7 +382,9 @@ class SsaLiveIntervalBuilder extends HBaseVisitor {
other.liveInstructions[instruction] = id;
});
other.removeLoopMarker(header);
- env.loopMarkers.forEach((k, v) { other.loopMarkers[k] = v; });
+ env.loopMarkers.forEach((k, v) {
+ other.loopMarkers[k] = v;
+ });
}
});
}
@@ -415,8 +419,8 @@ class CopyHandler {
final List<Copy> assignments;
CopyHandler()
- : copies = new List<Copy>(),
- assignments = new List<Copy>();
+ : copies = new List<Copy>(),
+ assignments = new List<Copy>();
void addCopy(HInstruction source, HInstruction destination) {
copies.add(new Copy(source, destination));
@@ -453,10 +457,10 @@ class VariableNames {
}
VariableNames()
- : ownName = new Map<HInstruction, String>(),
- copyHandlers = new Map<HBasicBlock, CopyHandler>(),
- allUsedNames = new Set<String>(),
- swapTemp = 't0';
+ : ownName = new Map<HInstruction, String>(),
+ copyHandlers = new Map<HBasicBlock, CopyHandler>(),
+ allUsedNames = new Set<String>(),
+ swapTemp = 't0';
int get numberOfVariables => allUsedNames.length;
@@ -498,11 +502,9 @@ class VariableNamer {
int temporaryIndex = 0;
static final RegExp regexp = new RegExp('t[0-9]+');
- VariableNamer(LiveEnvironment environment,
- this.names,
- this.compiler)
- : usedNames = new Set<String>(),
- freeTemporaryNames = new List<String>() {
+ VariableNamer(LiveEnvironment environment, this.names, this.compiler)
+ : usedNames = new Set<String>(),
+ freeTemporaryNames = new List<String>() {
// [VariableNames.swapTemp] is used when there is a cycle in a copy handler.
// Therefore we make sure no one uses it.
usedNames.add(names.swapTemp);
@@ -614,7 +616,6 @@ class VariableNamer {
* it adds a copy to the CopyHandler of the corresponding predecessor.
*/
class SsaVariableAllocator extends HBaseVisitor {
-
final Compiler compiler;
final Map<HBasicBlock, LiveEnvironment> liveInstructions;
final Map<HInstruction, LiveInterval> liveIntervals;
@@ -622,19 +623,17 @@ class SsaVariableAllocator extends HBaseVisitor {
final VariableNames names;
- SsaVariableAllocator(this.compiler,
- this.liveInstructions,
- this.liveIntervals,
- this.generateAtUseSite)
- : this.names = new VariableNames();
+ SsaVariableAllocator(this.compiler, this.liveInstructions, this.liveIntervals,
+ this.generateAtUseSite)
+ : this.names = new VariableNames();
void visitGraph(HGraph graph) {
visitDominatorTree(graph);
}
void visitBasicBlock(HBasicBlock block) {
- VariableNamer namer = new VariableNamer(
- liveInstructions[block], names, compiler);
+ VariableNamer namer =
+ new VariableNamer(liveInstructions[block], names, compiler);
block.forEachPhi((HPhi phi) {
handlePhi(phi, namer);
@@ -667,9 +666,8 @@ class SsaVariableAllocator extends HBaseVisitor {
return instructionInterval.diesAt(start);
}
- void freeUsedNamesAt(HInstruction instruction,
- HInstruction at,
- VariableNamer namer) {
+ void freeUsedNamesAt(
+ HInstruction instruction, HInstruction at, VariableNamer namer) {
if (needsName(instruction)) {
if (diesAt(instruction, at)) {
namer.freeName(instruction);
« no previous file with comments | « pkg/compiler/lib/src/ssa/value_set.dart ('k') | pkg/compiler/lib/src/string_validator.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698