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

Unified Diff: sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Issue 13877005: Fix invalid SSA graph generated by dart2js by using the savedLocals in a do/while (the ones before … (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 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 | « no previous file | tests/language/do_while4_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/ssa/builder.dart (revision 21266)
+++ sdk/lib/_internal/compiler/implementation/ssa/builder.dart (working copy)
@@ -610,7 +610,7 @@
new LinkedHashMap<Element,HInstruction>();
HInstruction thisValue = null;
directLocals.forEach((Element element, HInstruction instruction) {
- if (!identical(element, closureData.thisElement)) {
+ if (element != closureData.thisElement) {
HPhi phi = new HPhi.noInputs(element);
joinedLocals[element] = phi;
joinBlock.addPhi(phi);
@@ -633,7 +633,17 @@
// If there was a "this" for the scope, add it to the new locals.
joinedLocals[closureData.thisElement] = thisValue;
}
- directLocals = joinedLocals;
+
+ // Remove locals that are not in all handlers.
+ directLocals = new LinkedHashMap<Element, HInstruction>();
+ joinedLocals.forEach((element, instruction) {
+ if (instruction is HPhi
+ && instruction.inputs.length != localsHandlers.length) {
+ joinBlock.removePhi(instruction);
+ } else {
+ directLocals[element] = instruction;
+ }
+ });
return this;
}
}
« no previous file with comments | « no previous file | tests/language/do_while4_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698