[clang][bytecode] Explicitly truncate in IntegralAP::from() #112683
Merged
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
Add Integral::toAPInt(), which truncates to the given BitWidth, similar to the toAPSInt() we already have.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) ChangesAdd Integral::toAPInt(), which truncates to the given BitWidth, similar to the toAPSInt() we already have. Full diff: https://github.com/llvm/llvm-project/pull/112683.diff 2 Files Affected:
diff --git a/clang/lib/AST/ByteCode/Integral.h b/clang/lib/AST/ByteCode/Integral.h
index e06ec1669259da..be537d22d5af1b 100644
--- a/clang/lib/AST/ByteCode/Integral.h
+++ b/clang/lib/AST/ByteCode/Integral.h
@@ -122,11 +122,14 @@ template <unsigned Bits, bool Signed> class Integral final {
APSInt toAPSInt() const {
return APSInt(APInt(Bits, static_cast<uint64_t>(V), Signed), !Signed);
}
- APSInt toAPSInt(unsigned NumBits) const {
+ APSInt toAPSInt(unsigned BitWidth) const { return APSInt(toAPInt(BitWidth)); }
+ APInt toAPInt(unsigned BitWidth) const {
if constexpr (Signed)
- return APSInt(toAPSInt().sextOrTrunc(NumBits), !Signed);
+ return APInt(Bits, static_cast<uint64_t>(V), Signed)
+ .sextOrTrunc(BitWidth);
else
- return APSInt(toAPSInt().zextOrTrunc(NumBits), !Signed);
+ return APInt(Bits, static_cast<uint64_t>(V), Signed)
+ .zextOrTrunc(BitWidth);
}
APValue toAPValue(const ASTContext &) const { return APValue(toAPSInt()); }
diff --git a/clang/lib/AST/ByteCode/IntegralAP.h b/clang/lib/AST/ByteCode/IntegralAP.h
index 252d7243bee73e..f8aeaaca398fe8 100644
--- a/clang/lib/AST/ByteCode/IntegralAP.h
+++ b/clang/lib/AST/ByteCode/IntegralAP.h
@@ -112,12 +112,7 @@ template <bool Signed> class IntegralAP final {
template <unsigned Bits, bool InputSigned>
static IntegralAP from(Integral<Bits, InputSigned> I, unsigned BitWidth) {
- // TODO: Avoid implicit trunc?
- // See https://github.com/llvm/llvm-project/issues/112510.
- APInt Copy = APInt(BitWidth, static_cast<uint64_t>(I), InputSigned,
- /*implicitTrunc=*/true);
-
- return IntegralAP<Signed>(Copy);
+ return IntegralAP<Signed>(I.toAPInt(BitWidth));
}
static IntegralAP zero(int32_t BitWidth) {
|
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/55/builds/2871 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Add Integral::toAPInt(), which truncates to the given BitWidth, similar to the toAPSInt() we already have.