averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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
2025-04-25 10:17:16 -07:00
parent 1d741b85ef 68869c6a2d
commit dd8c99e095
15 changed files with 147 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/IRGen/GenStruct.cpp
View File

@@ -16,6 +16,7 @@
#include "GenStruct.h"
#include "IRGen.h"
#include "swift/AST/ClangModuleLoader.h"
#include "swift/AST/ConformanceLookup.h"
#include "swift/AST/Decl.h"
@@ -42,6 +43,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/Function.h"
#include "llvm/Support/Error.h"
#include <iterator>
#include "GenDecl.h"
@@ -1459,6 +1461,14 @@ private:
unsigned fieldOffset = layout.getFieldOffset(clangField->getFieldIndex());
assert(!clangField->isBitField());
Size offset( SubobjectAdjustment.getValue() + fieldOffset / 8);
std::optional<Size> dataSize;
if (clangField->hasAttr<clang::NoUniqueAddressAttr>()) {
if (const auto *rd = clangField->getType()->getAsRecordDecl()) {
// Clang can store the next field in the padding of this one.
const auto &fieldLayout = ClangContext.getASTRecordLayout(rd);
dataSize = Size(fieldLayout.getDataSize().getQuantity());
}
}
// If we have a Swift import of this type, use our lowered information.
if (swiftField) {
@@ -1471,7 +1481,8 @@ private:
// Otherwise, add it as an opaque blob.
auto fieldSize = isZeroSized ? clang::CharUnits::Zero() : ClangContext.getTypeSizeInChars(clangField->getType());
return addOpaqueField(offset, Size(fieldSize.getQuantity()));
return addOpaqueField(offset,
dataSize.value_or(Size(fieldSize.getQuantity())));
}
/// Add opaque storage for bitfields spanning the given range of bits.