Author: Andy Kaylor Date: 2026-09-01T13:54:59-07:00 New Revision: d3b93db802d67017c51e78a65d48dee90f93dd21
URL: https://github.com/llvm/llvm-project/commit/d3b93db802d67017c51e78a65d48dee90f93dd21 DIFF: https://github.com/llvm/llvm-project/commit/d3b93db802d67017c51e78a65d48dee90f93dd21.diff LOG: Revert "[LLVMABI][NFC] Align base class handling with Clang's AST (#218545)" (#220353) This reverts commit 0260138561bdadca6685e1873d578b892fddf736. The extra tracking for direct virtual base classes appears not to be needed. Added: Modified: clang/lib/CodeGen/QualTypeMapper.cpp llvm/include/llvm/ABI/Types.h llvm/lib/ABI/Targets/X86.cpp llvm/lib/ABI/Types.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/QualTypeMapper.cpp b/clang/lib/CodeGen/QualTypeMapper.cpp index c8be9de4769c8..212a138f9b7b7 100644 --- a/clang/lib/CodeGen/QualTypeMapper.cpp +++ b/clang/lib/CodeGen/QualTypeMapper.cpp @@ -397,19 +397,16 @@ QualTypeMapper::convertCXXRecordType(const CXXRecordDecl *RD) { } for (const auto &Base : RD->bases()) { + if (Base.isVirtual()) + continue; + const RecordType *BaseRT = Base.getType()->castAs<RecordType>(); - const CXXRecordDecl *BaseDecl = BaseRT->getAsCXXRecordDecl(); const llvm::abi::Type *BaseType = convertType(Base.getType()); - // Virtual and non-virtual base offsets live in separate maps in the AST - // record layout. uint64_t BaseOffset = - (Base.isVirtual() ? Layout.getVBaseClassOffset(BaseDecl) - : Layout.getBaseClassOffset(BaseDecl)) - .getQuantity() * + Layout.getBaseClassOffset(BaseRT->getAsCXXRecordDecl()).getQuantity() * 8; - BaseClasses.emplace_back(BaseType, BaseOffset, /*IsBitField=*/false, - /*BitFieldWidth=*/0, /*IsUnnamedBitField=*/false, - /*IsVirtualBase=*/Base.isVirtual()); + + BaseClasses.emplace_back(BaseType, BaseOffset); } for (const auto &VBase : RD->vbases()) { @@ -420,11 +417,7 @@ QualTypeMapper::convertCXXRecordType(const CXXRecordDecl *RD) { .getQuantity() * 8; - VirtualBaseClasses.emplace_back(VBaseType, VBaseOffset, - /*IsBitField=*/false, - /*BitFieldWidth=*/0, - /*IsUnnamedBitField=*/false, - /*IsVirtualBase=*/true); + VirtualBaseClasses.emplace_back(VBaseType, VBaseOffset); } computeFieldInfo(RD, Fields, Layout); diff --git a/llvm/include/llvm/ABI/Types.h b/llvm/include/llvm/ABI/Types.h index 07c0480835794..9ae5e8ea49c37 100644 --- a/llvm/include/llvm/ABI/Types.h +++ b/llvm/include/llvm/ABI/Types.h @@ -237,14 +237,13 @@ struct FieldInfo { uint64_t BitFieldWidth; bool IsBitField; bool IsUnnamedBitfield; - bool IsVirtualBase; FieldInfo(const Type *FieldType, uint64_t OffsetInBits = 0, bool IsBitField = false, uint64_t BitFieldWidth = 0, - bool IsUnnamedBitField = false, bool IsVirtualBase = false) + bool IsUnnamedBitField = false) : FieldType(FieldType), OffsetInBits(OffsetInBits), BitFieldWidth(BitFieldWidth), IsBitField(IsBitField), - IsUnnamedBitfield(IsUnnamedBitField), IsVirtualBase(IsVirtualBase) {} + IsUnnamedBitfield(IsUnnamedBitField) {} LLVM_ABI bool isEmpty() const; }; @@ -305,16 +304,7 @@ class RecordType : public Type { return static_cast<unsigned>(Flags & RecordFlags::IsTransparent) != 0; } ArrayRef<FieldInfo> getFields() const { return Fields; } - - /// Returns the direct base classes, both virtual and non-virtual, mirroring - /// clang::CXXRecordDecl::bases(). A virtual base is marked with - /// FieldInfo::IsVirtualBase, and its offset is only meaningful when this - /// record is the most-derived object. ArrayRef<FieldInfo> getBaseClasses() const { return BaseClasses; } - - /// Returns the virtual base classes, both direct and indirect, mirroring - /// clang::CXXRecordDecl::vbases(). Direct virtual bases therefore appear - /// both here and in getBaseClasses(). ArrayRef<FieldInfo> getVirtualBaseClasses() const { return VirtualBaseClasses; } diff --git a/llvm/lib/ABI/Targets/X86.cpp b/llvm/lib/ABI/Targets/X86.cpp index e496c4bf4bec5..88bfb8ad453cc 100644 --- a/llvm/lib/ABI/Targets/X86.cpp +++ b/llvm/lib/ABI/Targets/X86.cpp @@ -525,9 +525,6 @@ void X86_64TargetInfo::classify(const Type *T, uint64_t OffsetBase, Class &Lo, // If this is a C++ record, classify the bases first. if (RT->isCXXRecord()) { for (const auto &Base : RT->getBaseClasses()) { - // A class with a virtual base has a non-trivial copy constructor, so - // getRecordArgABI() above returned before we got here. - assert(!Base.IsVirtualBase && "Unexpected base class!"); // Classify this field. // @@ -960,9 +957,6 @@ static bool bitsContainNoUserData(const Type *Ty, unsigned StartBit, if (RT->isCXXRecord()) { for (unsigned I = 0; I < RT->getNumBaseClasses(); ++I) { const FieldInfo &Base = RT->getBaseClasses()[I]; - // This only runs for types being passed in registers, which cannot - // have virtual bases. - assert(!Base.IsVirtualBase && "Unexpected base class!"); if (Base.OffsetInBits >= EndBit) continue; diff --git a/llvm/lib/ABI/Types.cpp b/llvm/lib/ABI/Types.cpp index 6c44e1f4d1e48..78132aa71fa97 100644 --- a/llvm/lib/ABI/Types.cpp +++ b/llvm/lib/ABI/Types.cpp @@ -39,10 +39,6 @@ RecordType::getElementContainingOffset(unsigned OffsetInBits) const { }; for (const FieldInfo &Base : getBaseClasses()) { - // Direct virtual bases are revisited by the virtual base loop below, which - // also covers the indirect ones. - if (Base.IsVirtualBase) - continue; const auto *BaseRT = dyn_cast<RecordType>(Base.FieldType); if ((!BaseRT || !BaseRT->isEmpty()) && Contains(Base)) return &Base; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
