From b031fdc9b7dbd9c7f942d8060a4f00d63f3c9af2 Mon Sep 17 00:00:00 2001 From: Akira Hatanaka Date: Mon, 12 Mar 2018 17:05:06 +0000 Subject: [PATCH] Revert "[ObjC] Allow declaring __weak pointer fields in C structs in ARC." This reverts commit r327206 as there were test failures caused by this patch. http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20180312/221427.html git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@327294 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/Decl.h | 18 -- include/clang/AST/DeclCXX.h | 18 ++ include/clang/AST/Type.h | 10 - lib/AST/ASTImporter.cpp | 1 + lib/AST/Decl.cpp | 3 +- lib/AST/DeclCXX.cpp | 1 + lib/AST/Type.cpp | 32 +-- lib/CodeGen/CGBlocks.cpp | 7 +- lib/CodeGen/CGNonTrivialStruct.cpp | 59 +----- lib/CodeGen/CGObjC.cpp | 15 -- lib/CodeGen/CodeGenFunction.h | 2 - lib/CodeGen/TargetInfo.cpp | 27 +-- lib/Sema/SemaDecl.cpp | 8 +- lib/Serialization/ASTReaderDecl.cpp | 3 +- lib/Serialization/ASTWriter.cpp | 1 + lib/Serialization/ASTWriterDecl.cpp | 2 - .../nontrivial-c-struct-exception.m | 31 +-- test/CodeGenObjC/weak-in-c-struct.m | 193 ------------------ 18 files changed, 51 insertions(+), 380 deletions(-) delete mode 100644 test/CodeGenObjC/weak-in-c-struct.m diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 83becc82e8..57c6f45336 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -3553,12 +3553,6 @@ class RecordDecl : public TagDecl { bool NonTrivialToPrimitiveCopy : 1; bool NonTrivialToPrimitiveDestroy : 1; - /// True if this class can be passed in a non-address-preserving fashion - /// (such as in registers). - /// This does not imply anything about how the ABI in use will actually - /// pass an object of this class. - bool CanPassInRegisters : 1; - protected: RecordDecl(Kind DK, TagKind TK, const ASTContext &C, DeclContext *DC, SourceLocation StartLoc, SourceLocation IdLoc, @@ -3642,18 +3636,6 @@ public: NonTrivialToPrimitiveDestroy = true; } - /// Determine whether this class can be passed in registers. In C++ mode, - /// it must have at least one trivial, non-deleted copy or move constructor. - /// FIXME: This should be set as part of completeDefinition. - bool canPassInRegisters() const { - return CanPassInRegisters; - } - - /// Set that we can pass this RecordDecl in registers. - void setCanPassInRegisters(bool CanPass) { - CanPassInRegisters = CanPass; - } - /// \brief Determines whether this declaration represents the /// injected class name. /// diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h index e9f6f9ef6e..faa86e3781 100644 --- a/include/clang/AST/DeclCXX.h +++ b/include/clang/AST/DeclCXX.h @@ -467,6 +467,12 @@ class CXXRecordDecl : public RecordDecl { /// constructor. unsigned HasDefaultedDefaultConstructor : 1; + /// \brief True if this class can be passed in a non-address-preserving + /// fashion (such as in registers) according to the C++ language rules. + /// This does not imply anything about how the ABI in use will actually + /// pass an object of this class. + unsigned CanPassInRegisters : 1; + /// \brief True if a defaulted default constructor for this class would /// be constexpr. unsigned DefaultedDefaultConstructorIsConstexpr : 1; @@ -1468,6 +1474,18 @@ public: return data().HasIrrelevantDestructor; } + /// \brief Determine whether this class has at least one trivial, non-deleted + /// copy or move constructor. + bool canPassInRegisters() const { + return data().CanPassInRegisters; + } + + /// \brief Set that we can pass this RecordDecl in registers. + // FIXME: This should be set as part of completeDefinition. + void setCanPassInRegisters(bool CanPass) { + data().CanPassInRegisters = CanPass; + } + /// Determine whether the triviality for the purpose of calls for this class /// is overridden to be trivial because this class or the type of one of its /// subobjects has attribute "trivial_abi". diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h index 082b1e3ba1..4dd67f795e 100644 --- a/include/clang/AST/Type.h +++ b/include/clang/AST/Type.h @@ -1097,10 +1097,6 @@ public: /// with the ARC __strong qualifier. PDIK_ARCStrong, - /// The type is an Objective-C retainable pointer type that is qualified - /// with the ARC __weak qualifier. - PDIK_ARCWeak, - /// The type is a struct containing a field whose type is not PCK_Trivial. PDIK_Struct }; @@ -1128,10 +1124,6 @@ public: /// with the ARC __strong qualifier. PCK_ARCStrong, - /// The type is an Objective-C retainable pointer type that is qualified - /// with the ARC __weak qualifier. - PCK_ARCWeak, - /// The type is a struct containing a field whose type is neither /// PCK_Trivial nor PCK_VolatileTrivial. /// Note that a C++ struct type does not necessarily match this; C++ copying @@ -1154,8 +1146,6 @@ public: /// source object is placed in an uninitialized state. PrimitiveCopyKind isNonTrivialToPrimitiveDestructiveMove() const; - bool canPassInRegisters() const; - enum DestructionKind { DK_none, DK_cxx_destructor, diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp index 6b9260d2d8..ac262e7062 100644 --- a/lib/AST/ASTImporter.cpp +++ b/lib/AST/ASTImporter.cpp @@ -1105,6 +1105,7 @@ bool ASTNodeImporter::ImportDefinition(RecordDecl *From, RecordDecl *To, = FromData.HasConstexprNonCopyMoveConstructor; ToData.HasDefaultedDefaultConstructor = FromData.HasDefaultedDefaultConstructor; + ToData.CanPassInRegisters = FromData.CanPassInRegisters; ToData.DefaultedDefaultConstructorIsConstexpr = FromData.DefaultedDefaultConstructorIsConstexpr; ToData.HasConstexprDefaultConstructor diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 35364d6abc..b640dccbd8 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -3931,8 +3931,7 @@ RecordDecl::RecordDecl(Kind DK, TagKind TK, const ASTContext &C, HasObjectMember(false), HasVolatileMember(false), LoadedFieldsFromExternalStorage(false), NonTrivialToPrimitiveDefaultInitialize(false), - NonTrivialToPrimitiveCopy(false), NonTrivialToPrimitiveDestroy(false), - CanPassInRegisters(true) { + NonTrivialToPrimitiveCopy(false), NonTrivialToPrimitiveDestroy(false) { assert(classof(static_cast(this)) && "Invalid Kind!"); } diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index 271872352c..487386fdb5 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -93,6 +93,7 @@ CXXRecordDecl::DefinitionData::DefinitionData(CXXRecordDecl *D) DeclaredNonTrivialSpecialMembersForCall(0), HasIrrelevantDestructor(true), HasConstexprNonCopyMoveConstructor(false), HasDefaultedDefaultConstructor(false), + CanPassInRegisters(true), DefaultedDefaultConstructorIsConstexpr(true), HasConstexprDefaultConstructor(false), HasNonLiteralTypeFieldsOrBases(false), ComputedVisibleConversions(false), diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index 8934beae74..da7fdb0ee1 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -2214,14 +2214,11 @@ QualType::isNonTrivialToPrimitiveDefaultInitialize() const { if (RT->getDecl()->isNonTrivialToPrimitiveDefaultInitialize()) return PDIK_Struct; - switch (getQualifiers().getObjCLifetime()) { - case Qualifiers::OCL_Strong: + Qualifiers::ObjCLifetime Lifetime = getQualifiers().getObjCLifetime(); + if (Lifetime == Qualifiers::OCL_Strong) return PDIK_ARCStrong; - case Qualifiers::OCL_Weak: - return PDIK_ARCWeak; - default: - return PDIK_Trivial; - } + + return PDIK_Trivial; } QualType::PrimitiveCopyKind QualType::isNonTrivialToPrimitiveCopy() const { @@ -2231,14 +2228,10 @@ QualType::PrimitiveCopyKind QualType::isNonTrivialToPrimitiveCopy() const { return PCK_Struct; Qualifiers Qs = getQualifiers(); - switch (Qs.getObjCLifetime()) { - case Qualifiers::OCL_Strong: + if (Qs.getObjCLifetime() == Qualifiers::OCL_Strong) return PCK_ARCStrong; - case Qualifiers::OCL_Weak: - return PCK_ARCWeak; - default: - return Qs.hasVolatile() ? PCK_VolatileTrivial : PCK_Trivial; - } + + return Qs.hasVolatile() ? PCK_VolatileTrivial : PCK_Trivial; } QualType::PrimitiveCopyKind @@ -2246,17 +2239,6 @@ QualType::isNonTrivialToPrimitiveDestructiveMove() const { return isNonTrivialToPrimitiveCopy(); } -bool QualType::canPassInRegisters() const { - if (const auto *RT = - getTypePtr()->getBaseElementTypeUnsafe()->getAs()) - return RT->getDecl()->canPassInRegisters(); - - if (getQualifiers().getObjCLifetime() == Qualifiers::OCL_Weak) - return false; - - return true; -} - bool Type::isLiteralType(const ASTContext &Ctx) const { if (isDependentType()) return false; diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index 2c34447ec7..132314ad2d 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -1525,9 +1525,6 @@ computeCopyInfoForBlockCapture(const BlockDecl::Capture &CI, QualType T, case QualType::PCK_Struct: return std::make_pair(BlockCaptureEntityKind::NonTrivialCStruct, BlockFieldFlags()); - case QualType::PCK_ARCWeak: - // We need to register __weak direct captures with the runtime. - return std::make_pair(BlockCaptureEntityKind::ARCWeak, Flags); case QualType::PCK_ARCStrong: // We need to retain the copied value for __strong direct captures. // If it's a block pointer, we have to copy the block and assign that to @@ -1545,6 +1542,10 @@ computeCopyInfoForBlockCapture(const BlockDecl::Capture &CI, QualType T, // Special rules for ARC captures: Qualifiers QS = T.getQualifiers(); + // We need to register __weak direct captures with the runtime. + if (QS.getObjCLifetime() == Qualifiers::OCL_Weak) + return std::make_pair(BlockCaptureEntityKind::ARCWeak, Flags); + // Non-ARC captures of retainable pointers are strong and // therefore require a call to _Block_object_assign. if (!QS.getObjCLifetime() && !LangOpts.ObjCAutoRefCount) diff --git a/lib/CodeGen/CGNonTrivialStruct.cpp b/lib/CodeGen/CGNonTrivialStruct.cpp index 731938af86..3b0b173198 100644 --- a/lib/CodeGen/CGNonTrivialStruct.cpp +++ b/lib/CodeGen/CGNonTrivialStruct.cpp @@ -77,8 +77,6 @@ struct DefaultInitializedTypeVisitor { switch (PDIK) { case QualType::PDIK_ARCStrong: return asDerived().visitARCStrong(FT, std::forward(Args)...); - case QualType::PDIK_ARCWeak: - return asDerived().visitARCWeak(FT, std::forward(Args)...); case QualType::PDIK_Struct: return asDerived().visitStruct(FT, std::forward(Args)...); case QualType::PDIK_Trivial: @@ -110,8 +108,6 @@ struct CopiedTypeVisitor { switch (PCK) { case QualType::PCK_ARCStrong: return asDerived().visitARCStrong(FT, std::forward(Args)...); - case QualType::PCK_ARCWeak: - return asDerived().visitARCWeak(FT, std::forward(Args)...); case QualType::PCK_Struct: return asDerived().visitStruct(FT, std::forward(Args)...); case QualType::PCK_Trivial: @@ -145,6 +141,11 @@ template struct StructVisitor { template void visitTrivial(Ts... Args) {} + template void visitARCWeak(Ts... Args) { + // FIXME: remove this when visitARCWeak is implemented in the subclasses. + llvm_unreachable("weak field is not expected"); + } + template void visitCXXDestructor(Ts... Args) { llvm_unreachable("field of a C++ struct type is not expected"); } @@ -244,13 +245,6 @@ template struct GenFuncNameBase { appendStr(getVolatileOffsetStr(FT.isVolatileQualified(), FieldOffset)); } - void visitARCWeak(QualType FT, const FieldDecl *FD, - CharUnits CurStructOffset) { - appendStr("_w"); - CharUnits FieldOffset = CurStructOffset + asDerived().getFieldOffset(FD); - appendStr(getVolatileOffsetStr(FT.isVolatileQualified(), FieldOffset)); - } - void visitStruct(QualType QT, const FieldDecl *FD, CharUnits CurStructOffset) { CharUnits FieldOffset = CurStructOffset + asDerived().getFieldOffset(FD); @@ -621,12 +615,6 @@ struct GenDestructor : StructVisitor, *CGF, getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD), QT); } - void visitARCWeak(QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, - std::array Addrs) { - CGF->destroyARCWeak( - *CGF, getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD), QT); - } - void callSpecialFunction(QualType FT, CharUnits Offset, std::array Addrs) { CGF->callCStructDestructor( @@ -648,12 +636,6 @@ struct GenDefaultInitialize getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD), QT); } - void visitARCWeak(QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, - std::array Addrs) { - CGF->EmitNullInitialization( - getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD), QT); - } - template void visitArray(FieldKind FK, QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, std::array Addrs) { @@ -696,14 +678,6 @@ struct GenCopyConstructor : GenBinaryFunc { llvm::Value *Val = CGF->EmitARCRetain(QT, SrcVal); CGF->EmitStoreOfScalar(Val, CGF->MakeAddrLValue(Addrs[DstIdx], QT), true); } - - void visitARCWeak(QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, - std::array Addrs) { - Addrs[DstIdx] = getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD); - Addrs[SrcIdx] = getAddrWithOffset(Addrs[SrcIdx], CurStackOffset, FD); - CGF->EmitARCCopyWeak(Addrs[DstIdx], Addrs[SrcIdx]); - } - void callSpecialFunction(QualType FT, CharUnits Offset, std::array Addrs) { CGF->callCStructCopyConstructor(CGF->MakeAddrLValue(Addrs[DstIdx], FT), @@ -726,14 +700,6 @@ struct GenMoveConstructor : GenBinaryFunc { CGF->EmitStoreOfScalar(SrcVal, CGF->MakeAddrLValue(Addrs[DstIdx], QT), /* isInitialization */ true); } - - void visitARCWeak(QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, - std::array Addrs) { - Addrs[DstIdx] = getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD); - Addrs[SrcIdx] = getAddrWithOffset(Addrs[SrcIdx], CurStackOffset, FD); - CGF->EmitARCMoveWeak(Addrs[DstIdx], Addrs[SrcIdx]); - } - void callSpecialFunction(QualType FT, CharUnits Offset, std::array Addrs) { CGF->callCStructMoveConstructor(CGF->MakeAddrLValue(Addrs[DstIdx], FT), @@ -754,14 +720,6 @@ struct GenCopyAssignment : GenBinaryFunc { CGF->EmitARCStoreStrong(CGF->MakeAddrLValue(Addrs[DstIdx], QT), SrcVal, false); } - - void visitARCWeak(QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, - std::array Addrs) { - Addrs[DstIdx] = getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD); - Addrs[SrcIdx] = getAddrWithOffset(Addrs[SrcIdx], CurStackOffset, FD); - CGF->emitARCCopyAssignWeak(QT, Addrs[DstIdx], Addrs[SrcIdx]); - } - void callSpecialFunction(QualType FT, CharUnits Offset, std::array Addrs) { CGF->callCStructCopyAssignmentOperator( @@ -789,13 +747,6 @@ struct GenMoveAssignment : GenBinaryFunc { CGF->EmitARCRelease(DstVal, ARCImpreciseLifetime); } - void visitARCWeak(QualType QT, const FieldDecl *FD, CharUnits CurStackOffset, - std::array Addrs) { - Addrs[DstIdx] = getAddrWithOffset(Addrs[DstIdx], CurStackOffset, FD); - Addrs[SrcIdx] = getAddrWithOffset(Addrs[SrcIdx], CurStackOffset, FD); - CGF->emitARCMoveAssignWeak(QT, Addrs[DstIdx], Addrs[SrcIdx]); - } - void callSpecialFunction(QualType FT, CharUnits Offset, std::array Addrs) { CGF->callCStructMoveAssignmentOperator( diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp index 6ece1d3bd7..e812ef399e 100644 --- a/lib/CodeGen/CGObjC.cpp +++ b/lib/CodeGen/CGObjC.cpp @@ -2307,21 +2307,6 @@ void CodeGenFunction::EmitARCCopyWeak(Address dst, Address src) { "objc_copyWeak"); } -void CodeGenFunction::emitARCCopyAssignWeak(QualType Ty, Address DstAddr, - Address SrcAddr) { - llvm::Value *Object = EmitARCLoadWeakRetained(SrcAddr); - Object = EmitObjCConsumeObject(Ty, Object); - EmitARCStoreWeak(DstAddr, Object, false); -} - -void CodeGenFunction::emitARCMoveAssignWeak(QualType Ty, Address DstAddr, - Address SrcAddr) { - llvm::Value *Object = EmitARCLoadWeakRetained(SrcAddr); - Object = EmitObjCConsumeObject(Ty, Object); - EmitARCStoreWeak(DstAddr, Object, false); - EmitARCDestroyWeak(SrcAddr); -} - /// Produce the code to do a objc_autoreleasepool_push. /// call i8* \@objc_autoreleasePoolPush(void) llvm::Value *CodeGenFunction::EmitObjCAutoreleasePoolPush() { diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index 7bb9466ca2..95d8229c7d 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -3548,8 +3548,6 @@ public: llvm::Value *EmitARCLoadWeak(Address addr); llvm::Value *EmitARCLoadWeakRetained(Address addr); llvm::Value *EmitARCStoreWeak(Address addr, llvm::Value *value, bool ignored); - void emitARCCopyAssignWeak(QualType Ty, Address DstAddr, Address SrcAddr); - void emitARCMoveAssignWeak(QualType Ty, Address DstAddr, Address SrcAddr); void EmitARCCopyWeak(Address dst, Address src); void EmitARCMoveWeak(Address dst, Address src); llvm::Value *EmitARCRetainAutorelease(QualType type, llvm::Value *value); diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 939679e794..aadbd3016b 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -140,11 +140,8 @@ bool SwiftABIInfo::isLegalVectorTypeForSwift(CharUnits vectorSize, static CGCXXABI::RecordArgABI getRecordArgABI(const RecordType *RT, CGCXXABI &CXXABI) { const CXXRecordDecl *RD = dyn_cast(RT->getDecl()); - if (!RD) { - if (!RT->getDecl()->canPassInRegisters()) - return CGCXXABI::RAA_Indirect; + if (!RD) return CGCXXABI::RAA_Default; - } return CXXABI.getRecordArgABI(RD); } @@ -156,20 +153,6 @@ static CGCXXABI::RecordArgABI getRecordArgABI(QualType T, return getRecordArgABI(RT, CXXABI); } -static bool classifyReturnType(const CGCXXABI &CXXABI, CGFunctionInfo &FI, - const ABIInfo &Info) { - QualType Ty = FI.getReturnType(); - - if (const auto *RT = Ty->getAs()) - if (!isa(RT->getDecl()) && - !RT->getDecl()->canPassInRegisters()) { - FI.getReturnInfo() = Info.getNaturalAlignIndirect(Ty); - return true; - } - - return CXXABI.classifyReturnType(FI); -} - /// Pass transparent unions as if they were the type of the first element. Sema /// should ensure that all elements of the union have the same "machine type". static QualType useFirstFieldIfTransparentUnion(QualType Ty) { @@ -1766,7 +1749,7 @@ void X86_32ABIInfo::computeInfo(CGFunctionInfo &FI) const { } else State.FreeRegs = DefaultNumRegisterParameters; - if (!::classifyReturnType(getCXXABI(), FI, *this)) { + if (!getCXXABI().classifyReturnType(FI)) { FI.getReturnInfo() = classifyReturnType(FI.getReturnType(), State); } else if (FI.getReturnInfo().isIndirect()) { // The C++ ABI is not aware of register usage, so we have to check if the @@ -3562,7 +3545,7 @@ void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const { unsigned FreeSSERegs = IsRegCall ? 16 : 8; unsigned NeededInt, NeededSSE; - if (!::classifyReturnType(getCXXABI(), FI, *this)) { + if (!getCXXABI().classifyReturnType(FI)) { if (IsRegCall && FI.getReturnType()->getTypePtr()->isRecordType() && !FI.getReturnType()->getTypePtr()->isUnionType()) { FI.getReturnInfo() = @@ -4912,7 +4895,7 @@ private: bool isIllegalVectorType(QualType Ty) const; void computeInfo(CGFunctionInfo &FI) const override { - if (!::classifyReturnType(getCXXABI(), FI, *this)) + if (!getCXXABI().classifyReturnType(FI)) FI.getReturnInfo() = classifyReturnType(FI.getReturnType()); for (auto &it : FI.arguments()) @@ -5643,7 +5626,7 @@ void WindowsARMTargetCodeGenInfo::setTargetAttributes( } void ARMABIInfo::computeInfo(CGFunctionInfo &FI) const { - if (!::classifyReturnType(getCXXABI(), FI, *this)) + if (!getCXXABI().classifyReturnType(FI)) FI.getReturnInfo() = classifyReturnType(FI.getReturnType(), FI.isVariadic()); diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 831aef2128..036082c941 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -15260,6 +15260,7 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl, // Get the type for the field. const Type *FDTy = FD->getType().getTypePtr(); + Qualifiers QS = FD->getType().getQualifiers(); if (!FD->isAnonymousStructOrUnion()) { // Remember all fields written by the user. @@ -15400,7 +15401,10 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl, QualType T = Context.getObjCObjectPointerType(FD->getType()); FD->setType(T); } else if (getLangOpts().allowsNonTrivialObjCLifetimeQualifiers() && - Record && !ObjCFieldLifetimeErrReported && Record->isUnion()) { + Record && !ObjCFieldLifetimeErrReported && + ((!getLangOpts().CPlusPlus && + QS.getObjCLifetime() == Qualifiers::OCL_Weak) || + Record->isUnion())) { // It's an error in ARC or Weak if a field has lifetime. // We don't want to report this in a system header, though, // so we just make the field unavailable. @@ -15446,8 +15450,6 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl, Record->setNonTrivialToPrimitiveCopy(); if (FT.isDestructedType()) Record->setNonTrivialToPrimitiveDestroy(); - if (!FT.canPassInRegisters()) - Record->setCanPassInRegisters(false); } if (Record && FD->getType().isVolatileQualified()) diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp index 8393663a27..10439d36f5 100644 --- a/lib/Serialization/ASTReaderDecl.cpp +++ b/lib/Serialization/ASTReaderDecl.cpp @@ -739,7 +739,6 @@ ASTDeclReader::VisitRecordDeclImpl(RecordDecl *RD) { RD->setAnonymousStructOrUnion(Record.readInt()); RD->setHasObjectMember(Record.readInt()); RD->setHasVolatileMember(Record.readInt()); - RD->setCanPassInRegisters(Record.readInt()); return Redecl; } @@ -1585,6 +1584,7 @@ void ASTDeclReader::ReadCXXDefinitionData( Data.HasIrrelevantDestructor = Record.readInt(); Data.HasConstexprNonCopyMoveConstructor = Record.readInt(); Data.HasDefaultedDefaultConstructor = Record.readInt(); + Data.CanPassInRegisters = Record.readInt(); Data.DefaultedDefaultConstructorIsConstexpr = Record.readInt(); Data.HasConstexprDefaultConstructor = Record.readInt(); Data.HasNonLiteralTypeFieldsOrBases = Record.readInt(); @@ -1724,6 +1724,7 @@ void ASTDeclReader::MergeDefinitionData( MATCH_FIELD(HasIrrelevantDestructor) OR_FIELD(HasConstexprNonCopyMoveConstructor) OR_FIELD(HasDefaultedDefaultConstructor) + MATCH_FIELD(CanPassInRegisters) MATCH_FIELD(DefaultedDefaultConstructorIsConstexpr) OR_FIELD(HasConstexprDefaultConstructor) MATCH_FIELD(HasNonLiteralTypeFieldsOrBases) diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index 577b91b2cf..53e09b3f3f 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -6018,6 +6018,7 @@ void ASTRecordWriter::AddCXXDefinitionData(const CXXRecordDecl *D) { Record->push_back(Data.HasIrrelevantDestructor); Record->push_back(Data.HasConstexprNonCopyMoveConstructor); Record->push_back(Data.HasDefaultedDefaultConstructor); + Record->push_back(Data.CanPassInRegisters); Record->push_back(Data.DefaultedDefaultConstructorIsConstexpr); Record->push_back(Data.HasConstexprDefaultConstructor); Record->push_back(Data.HasNonLiteralTypeFieldsOrBases); diff --git a/lib/Serialization/ASTWriterDecl.cpp b/lib/Serialization/ASTWriterDecl.cpp index bae9637e83..dd57029ca2 100644 --- a/lib/Serialization/ASTWriterDecl.cpp +++ b/lib/Serialization/ASTWriterDecl.cpp @@ -465,7 +465,6 @@ void ASTDeclWriter::VisitRecordDecl(RecordDecl *D) { Record.push_back(D->isAnonymousStructOrUnion()); Record.push_back(D->hasObjectMember()); Record.push_back(D->hasVolatileMember()); - Record.push_back(D->canPassInRegisters()); if (D->getDeclContext() == D->getLexicalDeclContext() && !D->hasAttrs() && @@ -1900,7 +1899,6 @@ void ASTWriter::WriteDeclAbbrevs() { Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // AnonymousStructUnion Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // hasObjectMember Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // hasVolatileMember - Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // canPassInRegisters // DC Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 6)); // LexicalOffset Abv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 6)); // VisibleOffset diff --git a/test/CodeGenObjC/nontrivial-c-struct-exception.m b/test/CodeGenObjC/nontrivial-c-struct-exception.m index 7db53bb742..a926a6d493 100644 --- a/test/CodeGenObjC/nontrivial-c-struct-exception.m +++ b/test/CodeGenObjC/nontrivial-c-struct-exception.m @@ -1,18 +1,12 @@ -// RUN: %clang_cc1 -triple arm64-apple-ios11 -fobjc-arc -fblocks -fobjc-runtime=ios-11.0 -fobjc-exceptions -fexceptions -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple arm64-apple-ios11 -fobjc-arc -fblocks -fobjc-runtime=ios-11.0 -fobjc-exceptions -fexceptions -fobjc-arc-exceptions -emit-llvm -o - %s | FileCheck %s // CHECK: %[[STRUCT_STRONG:.*]] = type { i32, i8* } -// CHECK: %[[STRUCT_WEAK:.*]] = type { i32, i8* } typedef struct { int i; id f1; } Strong; -typedef struct { - int i; - __weak id f1; -} Weak; - // CHECK: define void @testStrongException() // CHECK: %[[AGG_TMP:.*]] = alloca %[[STRUCT_STRONG]], align 8 // CHECK: %[[AGG_TMP1:.*]] = alloca %[[STRUCT_STRONG]], align 8 @@ -37,26 +31,3 @@ void calleeStrong(Strong, Strong); void testStrongException(void) { calleeStrong(genStrong(), genStrong()); } - -// CHECK: define void @testWeakException() -// CHECK: %[[AGG_TMP:.*]] = alloca %[[STRUCT_WEAK]], align 8 -// CHECK: %[[AGG_TMP1:.*]] = alloca %[[STRUCT_WEAK]], align 8 -// CHECK: call void @genWeak(%[[STRUCT_WEAK]]* sret %[[AGG_TMP]]) -// CHECK: invoke void @genWeak(%[[STRUCT_WEAK]]* sret %[[AGG_TMP1]]) - -// CHECK: call void @calleeWeak(%[[STRUCT_WEAK]]* %[[AGG_TMP]], %[[STRUCT_WEAK]]* %[[AGG_TMP1]]) -// CHECK: ret void - -// CHECK: landingpad { i8*, i32 } -// CHECK: %[[V3:.*]] = bitcast %[[STRUCT_WEAK]]* %[[AGG_TMP]] to i8** -// CHECK: call void @__destructor_8_w8(i8** %[[V3]]) -// CHECK: br label - -// CHECK: resume - -Weak genWeak(void); -void calleeWeak(Weak, Weak); - -void testWeakException(void) { - calleeWeak(genWeak(), genWeak()); -} diff --git a/test/CodeGenObjC/weak-in-c-struct.m b/test/CodeGenObjC/weak-in-c-struct.m deleted file mode 100644 index b0f4c08510..0000000000 --- a/test/CodeGenObjC/weak-in-c-struct.m +++ /dev/null @@ -1,193 +0,0 @@ -// RUN: %clang_cc1 -triple arm64-apple-ios11 -fobjc-arc -fblocks -fobjc-runtime=ios-11.0 -emit-llvm -o - %s | FileCheck -check-prefix=ARM64 -check-prefix=COMMON %s -// RUN: %clang_cc1 -triple thumbv7-apple-ios10 -fobjc-arc -fblocks -fobjc-runtime=ios-10.0 -emit-llvm -o - %s | FileCheck -check-prefix=COMMON %s -// RUN: %clang_cc1 -triple x86_64-apple-macosx10.13 -fobjc-arc -fblocks -fobjc-runtime=macosx-10.13.0 -emit-llvm -o - %s | FileCheck -check-prefix=COMMON %s -// RUN: %clang_cc1 -triple i386-apple-macosx10.13.0 -fobjc-arc -fblocks -fobjc-runtime=macosx-fragile-10.13.0 -emit-llvm -o - %s | FileCheck -check-prefix=COMMON %s - -typedef void (^BlockTy)(void); - -// COMMON: %[[STRUCT_WEAK:.*]] = type { i32, i8* } - -typedef struct { - int f0; - __weak id f1; -} Weak; - -Weak getWeak(void); -void calleeWeak(Weak); - -// ARM64: define void @test_constructor_destructor_Weak() -// ARM64: %[[T:.*]] = alloca %[[STRUCT_WEAK]], align 8 -// ARM64: %[[V0:.*]] = bitcast %[[STRUCT_WEAK]]* %[[T]] to i8** -// ARM64: call void @__default_constructor_8_w8(i8** %[[V0]]) -// ARM64: %[[V1:.*]] = bitcast %[[STRUCT_WEAK]]* %[[T]] to i8** -// ARM64: call void @__destructor_8_w8(i8** %[[V1]]) -// ARM64: ret void - -// ARM64: define linkonce_odr hidden void @__default_constructor_8_w8(i8** %[[DST:.*]]) -// ARM64: %[[DST_ADDR:.*]] = alloca i8**, align 8 -// ARM64: store i8** %[[DST]], i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V0:.*]] = load i8**, i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V1]] = bitcast i8** %[[V0]] to i8* -// ARM64: %[[V2:.*]] = getelementptr inbounds i8, i8* %[[V1]], i64 8 -// ARM64: %[[V3:.*]] = bitcast i8* %[[V2]] to i8** -// ARM64: %[[V4:.*]] = bitcast i8** %[[V3]] to i8* -// ARM64: call void @llvm.memset.p0i8.i64(i8* align 8 %[[V4]], i8 0, i64 8, i1 false) - -// ARM64: define linkonce_odr hidden void @__destructor_8_w8(i8** %[[DST:.*]]) -// ARM64: %[[DST_ADDR:.*]] = alloca i8**, align 8 -// ARM64: store i8** %[[DST]], i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V0:.*]] = load i8**, i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V1:.*]] = bitcast i8** %[[V0]] to i8* -// ARM64: %[[V2:.*]] = getelementptr inbounds i8, i8* %[[V1]], i64 8 -// ARM64: %[[V3:.*]] = bitcast i8* %[[V2]] to i8** -// ARM64: call void @objc_destroyWeak(i8** %[[V3]]) - -void test_constructor_destructor_Weak(void) { - Weak t; -} - -// ARM64: define void @test_copy_constructor_Weak(%[[STRUCT_WEAK]]* %{{.*}}) -// ARM64: call void @__copy_constructor_8_8_t0w4_w8(i8** %{{.*}}, i8** %{{.*}}) -// ARM64: call void @__destructor_8_w8(i8** %{{.*}}) - -// ARM64: define linkonce_odr hidden void @__copy_constructor_8_8_t0w4_w8(i8** %[[DST:.*]], i8** %[[SRC:.*]]) -// ARM64: %[[DST_ADDR:.*]] = alloca i8**, align 8 -// ARM64: %[[SRC_ADDR:.*]] = alloca i8**, align 8 -// ARM64: store i8** %[[DST]], i8*** %[[DST_ADDR]], align 8 -// ARM64: store i8** %[[SRC]], i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V0:.*]] = load i8**, i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V1:.*]] = load i8**, i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V2:.*]] = bitcast i8** %[[V0]] to i32* -// ARM64: %[[V3:.*]] = bitcast i8** %[[V1]] to i32* -// ARM64: %[[V4:.*]] = load i32, i32* %[[V3]], align 8 -// ARM64: store i32 %[[V4]], i32* %[[V2]], align 8 -// ARM64: %[[V5:.*]] = bitcast i8** %[[V0]] to i8* -// ARM64: %[[V6:.*]] = getelementptr inbounds i8, i8* %[[V5]], i64 8 -// ARM64: %[[V7:.*]] = bitcast i8* %[[V6]] to i8** -// ARM64: %[[V8:.*]] = bitcast i8** %[[V1]] to i8* -// ARM64: %[[V9:.*]] = getelementptr inbounds i8, i8* %[[V8]], i64 8 -// ARM64: %[[V10:.*]] = bitcast i8* %[[V9]] to i8** -// ARM64: call void @objc_copyWeak(i8** %[[V7]], i8** %[[V10]]) - -void test_copy_constructor_Weak(Weak *s) { - Weak t = *s; -} - -// ARM64: define void @test_copy_assignment_Weak(%[[STRUCT_WEAK]]* %{{.*}}, %[[STRUCT_WEAK]]* %{{.*}}) -// ARM64: call void @__copy_assignment_8_8_t0w4_w8(i8** %{{.*}}, i8** %{{.*}}) - -// ARM64: define linkonce_odr hidden void @__copy_assignment_8_8_t0w4_w8(i8** %[[DST:.*]], i8** %[[SRC:.*]]) -// ARM64: %[[DST_ADDR:.*]] = alloca i8**, align 8 -// ARM64: %[[SRC_ADDR:.*]] = alloca i8**, align 8 -// ARM64: store i8** %[[DST]], i8*** %[[DST_ADDR]], align 8 -// ARM64: store i8** %[[SRC]], i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V0:.*]] = load i8**, i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V1:.*]] = load i8**, i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V2:.*]] = bitcast i8** %[[V0]] to i32* -// ARM64: %[[V3:.*]] = bitcast i8** %[[V1]] to i32* -// ARM64: %[[V4:.*]] = load i32, i32* %[[V3]], align 8 -// ARM64: store i32 %[[V4]], i32* %[[V2]], align 8 -// ARM64: %[[V5:.*]] = bitcast i8** %[[V0]] to i8* -// ARM64: %[[V6:.*]] = getelementptr inbounds i8, i8* %[[V5]], i64 8 -// ARM64: %[[V7:.*]] = bitcast i8* %[[V6]] to i8** -// ARM64: %[[V8:.*]] = bitcast i8** %[[V1]] to i8* -// ARM64: %[[V9:.*]] = getelementptr inbounds i8, i8* %[[V8]], i64 8 -// ARM64: %[[V10:.*]] = bitcast i8* %[[V9]] to i8** -// ARM64: %[[V11:.*]] = call i8* @objc_loadWeakRetained(i8** %[[V10]]) -// ARM64: %[[V12:.*]] = call i8* @objc_storeWeak(i8** %[[V7]], i8* %[[V11]]) -// ARM64: call void @objc_release(i8* %[[V11]]) - -void test_copy_assignment_Weak(Weak *d, Weak *s) { - *d = *s; -} - -// ARM64: define internal void @__Block_byref_object_copy_(i8*, i8*) -// ARM64: call void @__move_constructor_8_8_t0w4_w8(i8** %{{.*}}, i8** %{{.*}}) - -// ARM64: define linkonce_odr hidden void @__move_constructor_8_8_t0w4_w8(i8** %[[DST:.*]], i8** %[[SRC:.*]]) -// ARM64: %[[DST_ADDR:.*]] = alloca i8**, align 8 -// ARM64: %[[SRC_ADDR:.*]] = alloca i8**, align 8 -// ARM64: store i8** %[[DST]], i8*** %[[DST_ADDR]], align 8 -// ARM64: store i8** %[[SRC]], i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V0:.*]] = load i8**, i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V1:.*]] = load i8**, i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V2:.*]] = bitcast i8** %[[V0]] to i32* -// ARM64: %[[V3:.*]] = bitcast i8** %[[V1]] to i32* -// ARM64: %[[V4:.*]] = load i32, i32* %[[V3]], align 8 -// ARM64: store i32 %[[V4]], i32* %[[V2]], align 8 -// ARM64: %[[V5:.*]] = bitcast i8** %[[V0]] to i8* -// ARM64: %[[V6:.*]] = getelementptr inbounds i8, i8* %[[V5]], i64 8 -// ARM64: %[[V7:.*]] = bitcast i8* %[[V6]] to i8** -// ARM64: %[[V8:.*]] = bitcast i8** %[[V1]] to i8* -// ARM64: %[[V9:.*]] = getelementptr inbounds i8, i8* %[[V8]], i64 8 -// ARM64: %[[V10:.*]] = bitcast i8* %[[V9]] to i8** -// ARM64: call void @objc_moveWeak(i8** %[[V7]], i8** %[[V10]]) - -void test_move_constructor_Weak(void) { - __block Weak t; - BlockTy b = ^{ (void)t; }; -} - -// ARM64: define void @test_move_assignment_Weak(%[[STRUCT_WEAK]]* %{{.*}}) -// ARM64: call void @__move_assignment_8_8_t0w4_w8(i8** %{{.*}}, i8** %{{.*}}) - -// ARM64: define linkonce_odr hidden void @__move_assignment_8_8_t0w4_w8(i8** %[[DST:.*]], i8** %[[SRC:.*]]) -// ARM64: %[[DST_ADDR:.*]] = alloca i8**, align 8 -// ARM64: %[[SRC_ADDR:.*]] = alloca i8**, align 8 -// ARM64: store i8** %[[DST]], i8*** %[[DST_ADDR]], align 8 -// ARM64: store i8** %[[SRC]], i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V0:.*]] = load i8**, i8*** %[[DST_ADDR]], align 8 -// ARM64: %[[V1:.*]] = load i8**, i8*** %[[SRC_ADDR]], align 8 -// ARM64: %[[V2:.*]] = bitcast i8** %[[V0]] to i32* -// ARM64: %[[V3:.*]] = bitcast i8** %[[V1]] to i32* -// ARM64: %[[V4:.*]] = load i32, i32* %[[V3]], align 8 -// ARM64: store i32 %[[V4]], i32* %[[V2]], align 8 -// ARM64: %[[V5:.*]] = bitcast i8** %[[V0]] to i8* -// ARM64: %[[V6:.*]] = getelementptr inbounds i8, i8* %[[V5]], i64 8 -// ARM64: %[[V7:.*]] = bitcast i8* %[[V6]] to i8** -// ARM64: %[[V8:.*]] = bitcast i8** %[[V1]] to i8* -// ARM64: %[[V9:.*]] = getelementptr inbounds i8, i8* %[[V8]], i64 8 -// ARM64: %[[V10:.*]] = bitcast i8* %[[V9]] to i8** -// ARM64: %[[V11:.*]] = call i8* @objc_loadWeakRetained(i8** %[[V10]]) -// ARM64: %[[V12:.*]] = call i8* @objc_storeWeak(i8** %[[V7]], i8* %[[V11]]) -// ARM64: call void @objc_destroyWeak(i8** %[[V10]]) -// ARM64: call void @objc_release(i8* %[[V11]]) - -void test_move_assignment_Weak(Weak *p) { - *p = getWeak(); -} - -// COMMON: define void @test_parameter_Weak(%[[STRUCT_WEAK]]* %[[A:.*]]) -// COMMON: %[[V0:.*]] = bitcast %[[STRUCT_WEAK]]* %[[A]] to i8** -// COMMON: call void @__destructor_{{.*}}(i8** %[[V0]]) - -void test_parameter_Weak(Weak a) { -} - -// COMMON: define void @test_argument_Weak(%[[STRUCT_WEAK]]* %[[A:.*]]) -// COMMON: %[[A_ADDR:.*]] = alloca %[[STRUCT_WEAK]]* -// COMMON: %[[AGG_TMP:.*]] = alloca %[[STRUCT_WEAK]] -// COMMON: store %[[STRUCT_WEAK]]* %[[A]], %[[STRUCT_WEAK]]** %[[A_ADDR]] -// COMMON: %[[V0:.*]] = load %[[STRUCT_WEAK]]*, %[[STRUCT_WEAK]]** %[[A_ADDR]] -// COMMON: %[[V1:.*]] = bitcast %[[STRUCT_WEAK]]* %[[AGG_TMP]] to i8** -// COMMON: %[[V2:.*]] = bitcast %[[STRUCT_WEAK]]* %[[V0]] to i8** -// COMMON: call void @__copy_constructor_{{.*}}(i8** %[[V1]], i8** %[[V2]]) -// COMMON: call void @calleeWeak(%[[STRUCT_WEAK]]* %[[AGG_TMP]]) -// COMMON-NEXT: ret - -void test_argument_Weak(Weak *a) { - calleeWeak(*a); -} - -// COMMON: define void @test_return_Weak(%[[STRUCT_WEAK]]* noalias sret %[[AGG_RESULT:.*]], %[[STRUCT_WEAK]]* %[[A:.*]]) -// COMMON: %[[A_ADDR:.*]] = alloca %[[STRUCT_WEAK]]* -// COMMON: store %[[STRUCT_WEAK]]* %[[A]], %[[STRUCT_WEAK]]** %[[A_ADDR]] -// COMMON: %[[V0:.*]] = load %[[STRUCT_WEAK]]*, %[[STRUCT_WEAK]]** %[[A_ADDR]] -// COMMON: %[[V1:.*]] = bitcast %[[STRUCT_WEAK]]* %[[AGG_RESULT]] to i8** -// COMMON: %[[V2:.*]] = bitcast %[[STRUCT_WEAK]]* %[[V0]] to i8** -// COMMON: call void @__copy_constructor_{{.*}}(i8** %[[V1]], i8** %[[V2]]) -// COMMON: ret void - -Weak test_return_Weak(Weak *a) { - return *a; -} -- 2.40.0