averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2023-07-31 08:53:31 -07:00
parent 9db42b3020 16c59fa12c
commit 1a9c1cf9f4
10 changed files with 103 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/Serialization.cpp
View File

@@ -3200,15 +3200,19 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
uint8_t rawAlign;
TypeID typeID;
auto SD = const_cast<StructDecl*>(cast<StructDecl>(D));
if (auto sizeAndAlign = attr->getSizeAndAlignment()) {
typeID = 0;
rawSize = sizeAndAlign->first;
rawAlign = sizeAndAlign->second;
} else if (auto likeType = attr->getResolvedScalarLikeType()) {
} else if (auto likeType
= attr->getResolvedScalarLikeType(SD)) {
typeID = S.addTypeRef(*likeType);
rawSize = 0;
rawAlign = 0;
} else if (auto likeArrayTypeAndCount = attr->getResolvedArrayLikeTypeAndCount()) {
} else if (auto likeArrayTypeAndCount
= attr->getResolvedArrayLikeTypeAndCount(SD)) {
typeID = S.addTypeRef(likeArrayTypeAndCount->first);
rawSize = likeArrayTypeAndCount->second;
rawAlign = static_cast<uint8_t>(~0u);