[stable][dart2js] Handle MarkerValue in NegateValue binary operations.

The MarkerValue class was added fairly recently: 404edd9 Bug: #54453 Change-Id: I10d327a24425cecb2f0b44c0ea04bafa4cbf0698 Cherry-pick: https://dart-review.googlesource.com/c/sdk/+/343800 Cherry-pick-request: #54494 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/344241 Commit-Queue: Nate Biggs <[email protected]> Reviewed-by: Sigmund Cherem <[email protected]>
dart-lang · Jan 5, 2024 · 719a36e · 719a36e
1 parent af44883
commit 719a36e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 3.2.5
+
+This is a patch release that:
+
+- Fixes a Dart2js issue with values updated in a loop. (issue [#54494][])
+
+[#54494]: https://github.com/dart-lang/sdk/issues/54494
+
 ## 3.2.4 - 2023-12-21
 
 This is a patch release that:

diff --git a/pkg/compiler/lib/src/ssa/value_range_analyzer.dart b/pkg/compiler/lib/src/ssa/value_range_analyzer.dart
@@ -530,7 +530,7 @@ class NegateValue extends Value {
       }
       return info.newSubtractValue(other, value);
     }
-    if (other is InstructionValue) {
+    if (other is VariableValue) {
       return info.newSubtractValue(other, value);
     }
     return other - value;
@@ -548,7 +548,7 @@ class NegateValue extends Value {
       }
       return info.newSubtractValue(this, other);
     }
-    if (other is InstructionValue) {
+    if (other is VariableValue) {
       return info.newSubtractValue(this, other);
     }
     if (other is NegateValue) return this + other.value;

diff --git a/tests/web/regress/issue/54453_test.dart b/tests/web/regress/issue/54453_test.dart
@@ -0,0 +1,13 @@
+// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// Make sure binary operations are correctly handled for range-like values in
+// SSA's value range analyzer.
+
+void main() {
+  int counter = 0;
+  for (int i = 0; i < 5; i++) {
+    counter += counter;
+  }
+}