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

Unified Diff: lib/compiler/implementation/ssa/codegen_helpers.dart

Issue 10889022: Address comments from CL 10660026. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 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 | « lib/compiler/implementation/ssa/codegen.dart ('k') | lib/compiler/implementation/ssa/nodes.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/ssa/codegen_helpers.dart
diff --git a/lib/compiler/implementation/ssa/codegen_helpers.dart b/lib/compiler/implementation/ssa/codegen_helpers.dart
index 6bc97c8f6e74b52c7c89c25f19619b8c3cef9a22..73976cee40c8181ae44f44db9031510a844d0055 100644
--- a/lib/compiler/implementation/ssa/codegen_helpers.dart
+++ b/lib/compiler/implementation/ssa/codegen_helpers.dart
@@ -18,7 +18,7 @@ class SsaInstructionMerger extends HBaseVisitor {
Set<HInstruction> generateAtUseSite;
void markAsGenerateAtUseSite(HInstruction instruction) {
- assert(!instruction.isStatement(types));
+ assert(!instruction.isJsStatement(types));
generateAtUseSite.add(instruction);
}
@@ -152,7 +152,7 @@ class SsaInstructionMerger extends HBaseVisitor {
markAsGenerateAtUseSite(instruction);
continue;
}
- if (instruction.isStatement(types)) {
+ if (instruction.isJsStatement(types)) {
expectedInputs.clear();
}
// See if the current instruction is the next non-trivial
@@ -186,7 +186,7 @@ class SsaConditionMerger extends HGraphVisitor {
Set<HInstruction> controlFlowOperators;
void markAsGenerateAtUseSite(HInstruction instruction) {
- assert(!instruction.isStatement(types));
+ assert(!instruction.isJsStatement(types));
generateAtUseSite.add(instruction);
}
@@ -282,7 +282,8 @@ class SsaConditionMerger extends HGraphVisitor {
HPhi phi = end.phis.first;
HInstruction thenInput = phi.inputs[0];
HInstruction elseInput = phi.inputs[1];
- if (thenInput.isStatement(types) || elseInput.isStatement(types)) return;
+ if (thenInput.isJsStatement(types) ||
+ elseInput.isJsStatement(types)) return;
if (hasAnyStatement(elseBlock, elseInput)) return;
assert(elseBlock.successors.length == 1);
« no previous file with comments | « lib/compiler/implementation/ssa/codegen.dart ('k') | lib/compiler/implementation/ssa/nodes.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698