diff options
author | Thomas Lively <tlively@google.com> | 2023-01-06 17:53:54 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-06 23:53:54 +0000 |
commit | dea55e161497b9c7beaaa9fb3cdff003060ac391 (patch) | |
tree | 9ce352adc9201dcc2fd30b398e4fb7ba8eeb1a44 /src | |
parent | 54b1cf9025f5564c49dba730dc9fe6600aa7d532 (diff) | |
download | binaryen-dea55e161497b9c7beaaa9fb3cdff003060ac391.tar.gz binaryen-dea55e161497b9c7beaaa9fb3cdff003060ac391.tar.bz2 binaryen-dea55e161497b9c7beaaa9fb3cdff003060ac391.zip |
Fix a bug optimizing out br_on_cast (#5403)
We were considering casts between unrelated types as unconditionally failing,
but in the case where the unrelated types are nullable, the cast could still
succeed if the value is null.
This bug was introduced in #5397.
Diffstat (limited to 'src')
-rw-r--r-- | src/ir/gc-type-utils.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ir/gc-type-utils.h b/src/ir/gc-type-utils.h index 6ac604ad2..8832d4d0f 100644 --- a/src/ir/gc-type-utils.h +++ b/src/ir/gc-type-utils.h @@ -61,9 +61,13 @@ inline EvaluationResult evaluateKindCheck(Expression* curr) { if (Type::isSubType(br->ref->type, br->castType)) { return flip ? Failure : Success; } - // If the cast type is unrelated to the type we have, the cast will - // certainly fail. - if (!Type::isSubType(br->castType, br->ref->type)) { + // If the cast type is unrelated to the type we have and it's not + // possible for the cast to succeed anyway because the value is null, + // then the cast will certainly fail. TODO: This is essentially the same + // as `canBeCastTo` in OptimizeInstructions. Find a way to deduplicate + // this logic. + if (!Type::isSubType(br->castType, br->ref->type) && + (br->castType.isNonNullable() || br->ref->type.isNonNullable())) { return flip ? Success : Failure; } return Unknown; |