[clang][bytecode][NFC] Switch BitcastBuffer to SmallVector #114677
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
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) ChangesThis is a little easier to work with since we are guaranteed that the item type of the vector is byte sized and not something else. Full diff: https://github.com/llvm/llvm-project/pull/114677.diff 1 Files Affected:
diff --git a/clang/lib/AST/ByteCode/InterpBuiltinBitCast.cpp b/clang/lib/AST/ByteCode/InterpBuiltinBitCast.cpp
index fde2c6d9b11ac8..1acd49de307b96 100644
--- a/clang/lib/AST/ByteCode/InterpBuiltinBitCast.cpp
+++ b/clang/lib/AST/ByteCode/InterpBuiltinBitCast.cpp
@@ -83,39 +83,33 @@ static void swapBytes(std::byte *M, size_t N) {
/// have indeterminate value.
/// All offsets are in bits.
struct BitcastBuffer {
- llvm::BitVector Data;
+ size_t SizeInBits = 0;
+ llvm::SmallVector<std::byte> Data;
BitcastBuffer() = default;
- size_t size() const { return Data.size(); }
+ size_t size() const { return SizeInBits; }
- const std::byte *data() const {
- unsigned NBytes = Data.size() / 8;
- unsigned BitVectorWordSize = sizeof(uintptr_t);
- bool FullWord = (NBytes % BitVectorWordSize == 0);
-
- // llvm::BitVector uses 64-bit fields internally, so when we have
- // fewer bytes than that, we need to compensate for that on
- // big endian hosts.
- unsigned DataPlus;
- if (llvm::sys::IsBigEndianHost)
- DataPlus = BitVectorWordSize - (NBytes % BitVectorWordSize);
- else
- DataPlus = 0;
-
- return reinterpret_cast<const std::byte *>(Data.getData().data()) +
- (FullWord ? 0 : DataPlus);
- }
+ const std::byte *data() const { return Data.data(); }
bool allInitialized() const {
// FIXME: Implement.
return true;
}
+ bool atByteBoundary() const { return (Data.size() * 8) == SizeInBits; }
+
+ void pushBit(bool Value) {
+ if (atByteBoundary())
+ Data.push_back(std::byte{0});
+
+ if (Value)
+ Data.back() |= (std::byte{1} << (SizeInBits % 8));
+ ++SizeInBits;
+ }
+
void pushData(const std::byte *data, size_t BitOffset, size_t BitWidth,
bool BigEndianTarget) {
- Data.reserve(BitOffset + BitWidth);
-
bool OnlyFullBytes = BitWidth % 8 == 0;
unsigned NBytes = BitWidth / 8;
@@ -125,7 +119,7 @@ struct BitcastBuffer {
std::byte B =
BigEndianTarget ? data[NBytes - OnlyFullBytes - I] : data[I];
for (unsigned X = 0; X != 8; ++X) {
- Data.push_back(bitof(B, X));
+ pushBit(bitof(B, X));
++BitsHandled;
}
}
@@ -137,7 +131,7 @@ struct BitcastBuffer {
assert((BitWidth - BitsHandled) < 8);
std::byte B = BigEndianTarget ? data[0] : data[NBytes];
for (size_t I = 0, E = (BitWidth - BitsHandled); I != E; ++I) {
- Data.push_back(bitof(B, I));
+ pushBit(bitof(B, I));
++BitsHandled;
}
@@ -363,5 +357,8 @@ bool clang::interp::DoBitCast(InterpState &S, CodePtr OpPC, const Pointer &Ptr,
HasIndeterminateBits = !Buffer.allInitialized();
std::memcpy(Buff, Buffer.data(), BuffSize);
+ if (llvm::sys::IsBigEndianHost)
+ swapBytes(Buff, BuffSize);
+
return Success;
}
|
This is a little easier to work with since we are guaranteed that the item type of the vector is byte sized and not something else.
tbaederr
force-pushed
the
builtin-bit-cast5
branch
from
eabd705 to
9583cf5
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/52/builds/3429 Here is the relevant piece of the build log for the reference |
PhilippRados
pushed a commit
to PhilippRados/llvm-project
that referenced
this pull request
Nov 6, 2024
This is a little easier to work with since we are guaranteed that the item type of the vector is byte sized and not something else.
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 is a little easier to work with since we are guaranteed that the item type of the vector is byte sized and not something else.