Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[IRGen] Fix misalignment of conditional invertible requirement counts #73277

Merged
merged 2 commits into from
May 1, 2024
Merged

[IRGen] Fix misalignment of conditional invertible requirement counts #73277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e673f7
Fix misalignment of conditional invertible requirement counts
Azoy Apr 26, 2024
852ef0b
Define a popcount util
Azoy Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/swift/ABI/GenericContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "swift/ABI/MetadataRef.h"
#include "swift/ABI/InvertibleProtocols.h"
#include "swift/ABI/TrailingObjects.h"
#include "swift/Basic/MathUtils.h"
#include "swift/Demangling/Demangle.h"

namespace swift {
Expand Down Expand Up @@ -696,7 +697,7 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
if (!asSelf()->hasConditionalInvertedProtocols())
return 0;

return countBitsUsed(getConditionalInvertedProtocols().rawBits());
return popcount(getConditionalInvertedProtocols().rawBits());
}

size_t numTrailingObjects(
Expand Down
13 changes: 13 additions & 0 deletions include/swift/Basic/MathUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

#include <cstddef>

#if SWIFT_COMPILER_IS_MSVC
#include <intrin.h>
#endif

namespace swift {

/// Round the given value up to the given alignment, as a power of two.
Expand All @@ -33,6 +37,15 @@ static inline size_t roundUpToAlignMask(size_t size, size_t alignMask) {
return (size + alignMask) & ~alignMask;
}

static inline unsigned popcount(unsigned value) {
#if SWIFT_COMPILER_IS_MSVC
return __popcnt(value);
#else
// Assume we have a compiler with this intrinsic.
return __builtin_popcount(value);
#endif
}

} // namespace swift

#endif // #ifndef SWIFT_BASIC_MATH_UTILS_H
7 changes: 7 additions & 0 deletions lib/IRGen/GenMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,13 @@ namespace {
B.addPlaceholderWithSize(IGM.Int16Ty));
}

// The conditional invertible protocol set is alone as a 16 bit slot, so
// an even amount of conditional invertible protocols will cause an uneven
// alignment.
if ((numProtocols & 1) == 0) {
B.addInt16(0);
}

// Emit the generic requirements for the conditional conformance
// to each invertible protocol.
auto nominal = cast<NominalTypeDecl>(Type);
Expand Down