languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dart2wasm] Fix canonicalization of concatenations with constants

Browse source 
New passing test: co19/Language/Expressions/Object_Identity/string_t01

Change-Id: I9e7758af30d1b11d136586090b82497c292cb1e3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286402
Reviewed-by: Aske Simon Christensen <askesc@google.com>
Commit-Queue: Ömer Ağacan <omersa@google.com>
This commit is contained in:
Ömer Sinan Ağacan 2023-03-02 13:30:38 +00:00 committed by Commit Queue
parent 88ac4a27a1
commit 095317db58
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/dart2wasm/lib/code_generator.dart
View file

@ -2670,10 +2670,22 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
@override
w.ValueType visitStringConcatenation(
StringConcatenation node, w.ValueType expectedType) {
if (node.expressions.every((expr) => expr is StringLiteral)) {
bool isConstantString(Expression expr) =>
expr is StringLiteral ||
(expr is ConstantExpression && expr.constant is StringConstant);
String extractConstantString(Expression expr) {
if (expr is StringLiteral) {
return expr.value;
} else {
return ((expr as ConstantExpression).constant as StringConstant).value;
}
}
if (node.expressions.every(isConstantString)) {
StringBuffer result = StringBuffer();
for (final expr in node.expressions) {
result.write((expr as StringLiteral).value);
result.write(extractConstantString(expr));
}
final expr = StringLiteral(result.toString());
return visitStringLiteral(expr, expectedType);