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

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

Issue 23453003: Optimizations on String.concat and String.toString need to make sure the receiver is not null. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 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 | « no previous file | tests/language/string_optimizations_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/optimize.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/ssa/optimize.dart (revision 26632)
+++ sdk/lib/_internal/compiler/implementation/ssa/optimize.dart (working copy)
@@ -293,10 +293,13 @@
target = backend.jsStringSplit;
}
} else if (selector.applies(backend.jsStringConcat, compiler)) {
- if (node.inputs[2].isString(compiler)) {
+ // `concat` is turned into a JavaScript '+' so we need to
+ // make sure the receiver is not null.
+ if (node.inputs[2].isString(compiler) && !input.canBeNull()) {
target = backend.jsStringConcat;
}
- } else if (selector.applies(backend.jsStringToString, compiler)) {
+ } else if (selector.applies(backend.jsStringToString, compiler)
+ && !input.canBeNull()) {
return input;
}
}
« no previous file with comments | « no previous file | tests/language/string_optimizations_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698