Raise Encoding::CompatibilityError with incompatible encodings on regexp #1775
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eregon
reviewed
Oct 28, 2019
eregon
reviewed
Oct 28, 2019
rafaelfranca
force-pushed
the
rm-raise-incompatible-encoding
branch
from
e8941f7 to
0679ef4
Compare
eregon
approved these changes
Oct 28, 2019
|
@rafaelfranca Could you rebase on top of current master and add a CHANGELOG entry? |
When the string and the regular expression have different encodings we should raise an Encoding::CompatibilityError.
rafaelfranca
force-pushed
the
rm-raise-incompatible-encoding
branch
from
0679ef4 to
c672c5b
Compare
eregon
reviewed
Oct 29, 2019
| @Cached("toEncodingNode.executeToEncoding(regexp)") Encoding regexpEncoding, | ||
| @Cached("toEncodingNode.executeToEncoding(string)") Encoding stringEncoding, | ||
| @Cached EncodingNodes.CompatibleQueryNode isCompatibleNode) { | ||
| throw new RaiseException(getContext(), coreExceptions().encodingCompatibilityErrorIncompatible(regexpEncoding, stringEncoding, this)); |
There was a problem hiding this comment.
I found out that we can use EncodingNodes.CheckEncodingNode instead and that removes the need for an extra specialization. I'll change it to that.
There was a problem hiding this comment.
Done in 7adbc48 and PR merged, thank you.
graalvmbot
pushed a commit
that referenced
this pull request
Oct 30, 2019
…ings on regexp (#1775). PullRequest: truffleruby/1095
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the string and the regular expression have different encodings we should raise an Encoding::CompatibilityError.
This fixes String#blank? of Active Support that depends on this behavior.
https://github.com/rails/rails/blob/ac193d0cc338bd024d1b9f41dee384da4f7c51c4/activesupport/lib/active_support/core_ext/object/blank.rb#L128-L129
Shopify#1