[flang] Fix -Wcharacter-conversion warnings (NFC) #155873
Open
+3
−2
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
|
@llvm/pr-subscribers-flang-parser @llvm/pr-subscribers-flang-semantics Author: Nikita Popov (nikic) ChangesThis fixes new warnings when building with Clang 21, encountered in #155627. Full diff: https://github.com/llvm/llvm-project/pull/155873.diff 2 Files Affected:
diff --git a/flang/lib/Evaluate/fold-implementation.h b/flang/lib/Evaluate/fold-implementation.h
index d757ef6e62eb4..3fdf3a6f38848 100644
--- a/flang/lib/Evaluate/fold-implementation.h
+++ b/flang/lib/Evaluate/fold-implementation.h
@@ -1785,7 +1785,7 @@ common::IfNoLvalue<std::optional<TO>, FROM> ConvertString(FROM &&s) {
if (static_cast<std::uint64_t>(*iter) > 127) {
return std::nullopt;
}
- str.push_back(*iter);
+ str.push_back(static_cast<typename TO::value_type>(*iter));
}
return std::make_optional<TO>(std::move(str));
}
diff --git a/flang/lib/Parser/characters.cpp b/flang/lib/Parser/characters.cpp
index f6ac777ea874c..1a00b16eefe9d 100644
--- a/flang/lib/Parser/characters.cpp
+++ b/flang/lib/Parser/characters.cpp
@@ -289,7 +289,8 @@ RESULT DecodeString(const std::string &s, bool backslashEscapes) {
DecodeCharacter<ENCODING>(p, bytes, backslashEscapes)};
if (decoded.bytes > 0) {
if (static_cast<std::size_t>(decoded.bytes) <= bytes) {
- result.append(1, decoded.codepoint);
+ result.append(
+ 1, static_cast<typename RESULT::value_type>(decoded.codepoint));
bytes -= decoded.bytes;
p += decoded.bytes;
continue;
|
nikic
commented
Aug 28, 2025
| @@ -1785,7 +1785,7 @@ common::IfNoLvalue<std::optional<TO>, FROM> ConvertString(FROM &&s) { | |||
| if (static_cast<std::uint64_t>(*iter) > 127) { | |||
| return std::nullopt; | |||
| } | |||
| str.push_back(*iter); | |||
| str.push_back(static_cast<typename TO::value_type>(*iter)); | |||
There was a problem hiding this comment.
This one is safe due to the preceding check.
nikic
commented
Aug 28, 2025
| @@ -289,7 +289,8 @@ RESULT DecodeString(const std::string &s, bool backslashEscapes) { | |||
| DecodeCharacter<ENCODING>(p, bytes, backslashEscapes)}; | |||
| if (decoded.bytes > 0) { | |||
| if (static_cast<std::size_t>(decoded.bytes) <= bytes) { | |||
| result.append(1, decoded.codepoint); | |||
| result.append( | |||
| 1, static_cast<typename RESULT::value_type>(decoded.codepoint)); | |||
There was a problem hiding this comment.
This one looks like it might truncate. Don't know whether this is somehow excluded by the broader context.
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.
This fixes new warnings when building with Clang 21, encountered in #155627.