diff options
40 files changed, 41 insertions, 425 deletions
diff --git a/llvm/docs/LangRef.rst b/llvm/docs/LangRef.rst index 2105ce9d669..840272df33f 100644 --- a/llvm/docs/LangRef.rst +++ b/llvm/docs/LangRef.rst @@ -1017,7 +1017,7 @@ Currently, only the following parameter attributes are defined: opposed to memory, though some targets use it to distinguish between two different kinds of registers). Use of this attribute is target-specific. -``byval`` or ``byval(<ty>)`` +``byval`` This indicates that the pointer parameter should really be passed by value to the function. The attribute implies that a hidden copy of the pointee is made between the caller and the callee, so the callee @@ -1029,9 +1029,6 @@ Currently, only the following parameter attributes are defined: ``byval`` parameters). This is not a valid attribute for return values. - The byval attribute also supports an optional type argument, which must be - the same as the pointee type of the argument. - The byval attribute also supports specifying an alignment with the align attribute. It indicates the alignment of the stack slot to form and the known alignment of the pointer specified to the call diff --git a/llvm/include/llvm/CodeGen/TargetLowering.h b/llvm/include/llvm/CodeGen/TargetLowering.h index f06e01acae3..cabca9cb221 100644 --- a/llvm/include/llvm/CodeGen/TargetLowering.h +++ b/llvm/include/llvm/CodeGen/TargetLowering.h @@ -188,7 +188,6 @@ public: bool IsSwiftSelf : 1; bool IsSwiftError : 1; uint16_t Alignment = 0; - Type *ByValType = nullptr; ArgListEntry() : IsSExt(false), IsZExt(false), IsInReg(false), IsSRet(false), diff --git a/llvm/include/llvm/IR/Argument.h b/llvm/include/llvm/IR/Argument.h index 952fbcdffb1..7997c863b83 100644 --- a/llvm/include/llvm/IR/Argument.h +++ b/llvm/include/llvm/IR/Argument.h @@ -78,9 +78,6 @@ public: /// If this is a byval or inalloca argument, return its alignment. unsigned getParamAlignment() const; - /// If this is a byval argument, return its type. - Type *getParamByValType() const; - /// Return true if this argument has the nest attribute. bool hasNestAttr() const; diff --git a/llvm/include/llvm/IR/Attributes.h b/llvm/include/llvm/IR/Attributes.h index 06cc09e1cfc..8d7f4018e84 100644 --- a/llvm/include/llvm/IR/Attributes.h +++ b/llvm/include/llvm/IR/Attributes.h @@ -90,7 +90,6 @@ public: static Attribute get(LLVMContext &Context, AttrKind Kind, uint64_t Val = 0); static Attribute get(LLVMContext &Context, StringRef Kind, StringRef Val = StringRef()); - static Attribute get(LLVMContext &Context, AttrKind Kind, Type *Ty); /// Return a uniquified Attribute object that has the specific /// alignment set. @@ -103,7 +102,6 @@ public: static Attribute getWithAllocSizeArgs(LLVMContext &Context, unsigned ElemSizeArg, const Optional<unsigned> &NumElemsArg); - static Attribute getWithByValType(LLVMContext &Context, Type *Ty); //===--------------------------------------------------------------------===// // Attribute Accessors @@ -119,9 +117,6 @@ public: /// attribute. bool isStringAttribute() const; - /// Return true if the attribute is a type attribute. - bool isTypeAttribute() const; - /// Return true if the attribute is present. bool hasAttribute(AttrKind Val) const; @@ -144,10 +139,6 @@ public: /// attribute to be a string attribute. StringRef getValueAsString() const; - /// Return the attribute's value as a Type. This requires the attribute to be - /// a type attribute. - Type *getValueAsType() const; - /// Returns the alignment field of an attribute as a byte alignment /// value. unsigned getAlignment() const; @@ -288,7 +279,6 @@ public: unsigned getStackAlignment() const; uint64_t getDereferenceableBytes() const; uint64_t getDereferenceableOrNullBytes() const; - Type *getByValType() const; std::pair<unsigned, Optional<unsigned>> getAllocSizeArgs() const; std::string getAsString(bool InAttrGrp = false) const; @@ -608,9 +598,6 @@ public: /// Return the alignment for the specified function parameter. unsigned getParamAlignment(unsigned ArgNo) const; - /// Return the byval type for the specified function parameter. - Type *getParamByValType(unsigned ArgNo) const; - /// Get the stack alignment. unsigned getStackAlignment(unsigned Index) const; @@ -710,7 +697,6 @@ class AttrBuilder { uint64_t DerefBytes = 0; uint64_t DerefOrNullBytes = 0; uint64_t AllocSizeArgs = 0; - Type *ByValType = nullptr; public: AttrBuilder() = default; @@ -786,9 +772,6 @@ public: /// dereferenceable_or_null attribute exists (zero is returned otherwise). uint64_t getDereferenceableOrNullBytes() const { return DerefOrNullBytes; } - /// Retrieve the byval type. - Type *getByValType() const { return ByValType; } - /// Retrieve the allocsize args, if the allocsize attribute exists. If it /// doesn't exist, pair(0, 0) is returned. std::pair<unsigned, Optional<unsigned>> getAllocSizeArgs() const; @@ -813,9 +796,6 @@ public: AttrBuilder &addAllocSizeAttr(unsigned ElemSizeArg, const Optional<unsigned> &NumElemsArg); - /// This turns a byval type into the form used internally in Attribute. - AttrBuilder &addByValAttr(Type *Ty); - /// Add an allocsize attribute, using the representation returned by /// Attribute.getIntValue(). AttrBuilder &addAllocSizeAttrFromRawRepr(uint64_t RawAllocSizeRepr); diff --git a/llvm/include/llvm/IR/CallSite.h b/llvm/include/llvm/IR/CallSite.h index b47a96c5d5f..183e387a422 100644 --- a/llvm/include/llvm/IR/CallSite.h +++ b/llvm/include/llvm/IR/CallSite.h @@ -415,11 +415,6 @@ public: CALLSITE_DELEGATE_GETTER(getParamAlignment(ArgNo)); } - /// Extract the byval type for a call or parameter (nullptr=unknown). - Type *getParamByValType(unsigned ArgNo) const { - CALLSITE_DELEGATE_GETTER(getParamByValType(ArgNo)); - } - /// Extract the number of dereferenceable bytes for a call or parameter /// (0=unknown). uint64_t getDereferenceableBytes(unsigned i) const { diff --git a/llvm/include/llvm/IR/Function.h b/llvm/include/llvm/IR/Function.h index 896c2189eb8..613d21bc64d 100644 --- a/llvm/include/llvm/IR/Function.h +++ b/llvm/include/llvm/IR/Function.h @@ -431,11 +431,6 @@ public: return AttributeSets.getParamAlignment(ArgNo); } - /// Extract the byval type for a parameter (nullptr=unknown). - Type *getParamByValType(unsigned ArgNo) const { - return AttributeSets.getParamByValType(ArgNo); - } - /// Extract the number of dereferenceable bytes for a call or /// parameter (0=unknown). /// @param i AttributeList index, referring to a return value or argument. diff --git a/llvm/include/llvm/IR/InstrTypes.h b/llvm/include/llvm/IR/InstrTypes.h index 6ce76811c0e..7ffa7a6f60e 100644 --- a/llvm/include/llvm/IR/InstrTypes.h +++ b/llvm/include/llvm/IR/InstrTypes.h @@ -1560,11 +1560,6 @@ public: return Attrs.getParamAlignment(ArgNo); } - /// Extract the byval type for a call or parameter (nullptr=unknown). - Type *getParamByValType(unsigned ArgNo) const { - return Attrs.getParamByValType(ArgNo); - } - /// Extract the number of dereferenceable bytes for a call or /// parameter (0=unknown). uint64_t getDereferenceableBytes(unsigned i) const { diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index 0a9a09e644d..95646675cb2 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -1601,13 +1601,7 @@ bool LLParser::ParseOptionalParamAttrs(AttrBuilder &B) { B.addAlignmentAttr(Alignment); continue; } - case lltok::kw_byval: { - Type *Ty; - if (ParseByValWithOptionalType(Ty)) - return true; - B.addByValAttr(Ty); - continue; - } + case lltok::kw_byval: B.addAttribute(Attribute::ByVal); break; case lltok::kw_dereferenceable: { uint64_t Bytes; if (ParseOptionalDerefAttrBytes(lltok::kw_dereferenceable, Bytes)) @@ -2460,22 +2454,6 @@ bool LLParser::ParseParameterList(SmallVectorImpl<ParamInfo> &ArgList, return false; } -/// ParseByValWithOptionalType -/// ::= byval -/// ::= byval(<ty>) -bool LLParser::ParseByValWithOptionalType(Type *&Result) { - Result = nullptr; - if (!EatIfPresent(lltok::kw_byval)) - return true; - if (!EatIfPresent(lltok::lparen)) - return false; - if (ParseType(Result)) - return true; - if (!EatIfPresent(lltok::rparen)) - return Error(Lex.getLoc(), "expected ')'"); - return false; -} - /// ParseOptionalOperandBundles /// ::= /*empty*/ /// ::= '[' OperandBundle [, OperandBundle ]* ']' diff --git a/llvm/lib/AsmParser/LLParser.h b/llvm/lib/AsmParser/LLParser.h index ec4a61b5498..ad169afb935 100644 --- a/llvm/lib/AsmParser/LLParser.h +++ b/llvm/lib/AsmParser/LLParser.h @@ -339,7 +339,6 @@ namespace llvm { bool ParseFnAttributeValuePairs(AttrBuilder &B, std::vector<unsigned> &FwdRefAttrGrps, bool inAttrGrp, LocTy &BuiltinLoc); - bool ParseByValWithOptionalType(Type *&Result); // Module Summary Index Parsing. bool SkipModuleSummaryEntry(); diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 9f562ba82db..134ce036703 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -638,10 +638,6 @@ private: return getFnValueByID(ValNo, Ty); } - /// Upgrades old-style typeless byval attributes by adding the corresponding - /// argument's pointee type. - void propagateByValTypes(CallBase *CB); - /// Converts alignment exponent (i.e. power of two (or zero)) to the /// corresponding alignment to use. If alignment is too large, returns /// a corresponding error code. @@ -1496,12 +1492,6 @@ Error BitcodeReader::parseAttributeGroupBlock() { if (Error Err = parseAttrKind(Record[++i], &Kind)) return Err; - // Upgrade old-style byval attribute to one with a type, even if it's - // nullptr. We will have to insert the real type when we associate - // this AttributeList with a function. - if (Kind == Attribute::ByVal) - B.addByValAttr(nullptr); - B.addAttribute(Kind); } else if (Record[i] == 1) { // Integer attribute Attribute::AttrKind Kind; @@ -1517,7 +1507,9 @@ Error BitcodeReader::parseAttributeGroupBlock() { B.addDereferenceableOrNullAttr(Record[++i]); else if (Kind == Attribute::AllocSize) B.addAllocSizeAttrFromRawRepr(Record[++i]); - } else if (Record[i] == 3 || Record[i] == 4) { // String attribute + } else { // String attribute + assert((Record[i] == 3 || Record[i] == 4) && + "Invalid attribute group entry"); bool HasValue = (Record[i++] == 4); SmallString<64> KindStr; SmallString<64> ValStr; @@ -1535,15 +1527,6 @@ Error BitcodeReader::parseAttributeGroupBlock() { } B.addAttribute(KindStr.str(), ValStr.str()); - } else { - assert((Record[i] == 5 || Record[i] == 6) && - "Invalid attribute group entry"); - bool HasType = Record[i] == 6; - Attribute::AttrKind Kind; - if (Error Err = parseAttrKind(Record[++i], &Kind)) - return Err; - if (Kind == Attribute::ByVal) - B.addByValAttr(HasType ? getTypeByID(Record[++i]) : nullptr); } } @@ -3045,17 +3028,6 @@ Error BitcodeReader::parseFunctionRecord(ArrayRef<uint64_t> Record) { Func->setLinkage(getDecodedLinkage(RawLinkage)); Func->setAttributes(getAttributes(Record[4])); - // Upgrade any old-style byval without a type by propagating the argument's - // pointee type. There should be no opaque pointers where the byval type is - // implicit. - for (auto &Arg : Func->args()) { - if (Arg.hasByValAttr() && !Arg.getParamByValType()) { - Arg.removeAttr(Attribute::ByVal); - Arg.addAttr(Attribute::getWithByValType( - Context, Arg.getType()->getPointerElementType())); - } - } - unsigned Alignment; if (Error Err = parseAlignmentValue(Record[5], Alignment)) return Err; @@ -3469,19 +3441,6 @@ Error BitcodeReader::typeCheckLoadStoreInst(Type *ValType, Type *PtrType) { return Error::success(); } -void BitcodeReader::propagateByValTypes(CallBase *CB) { - for (unsigned i = 0; i < CB->getNumArgOperands(); ++i) { - if (CB->paramHasAttr(i, Attribute::ByVal) && - !CB->getAttribute(i, Attribute::ByVal).getValueAsType()) { - CB->removeParamAttr(i, Attribute::ByVal); - CB->addParamAttr( - i, Attribute::getWithByValType( - Context, - CB->getArgOperand(i)->getType()->getPointerElementType())); - } - } -} - /// Lazily parse the specified function body block. Error BitcodeReader::parseFunctionBody(Function *F) { if (Stream.EnterSubBlock(bitc::FUNCTION_BLOCK_ID)) @@ -4297,8 +4256,6 @@ Error BitcodeReader::parseFunctionBody(Function *F) { cast<InvokeInst>(I)->setCallingConv( static_cast<CallingConv::ID>(CallingConv::MaxID & CCInfo)); cast<InvokeInst>(I)->setAttributes(PAL); - propagateByValTypes(cast<CallBase>(I)); - break; } case bitc::FUNC_CODE_INST_RESUME: { // RESUME: [opval] @@ -4774,7 +4731,6 @@ Error BitcodeReader::parseFunctionBody(Function *F) { TCK = CallInst::TCK_NoTail; cast<CallInst>(I)->setTailCallKind(TCK); cast<CallInst>(I)->setAttributes(PAL); - propagateByValTypes(cast<CallBase>(I)); if (FMF.any()) { if (!isa<FPMathOperator>(I)) return error("Fast-math-flags specified for call without " diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index d243815667f..8e1e06226bb 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -747,7 +747,7 @@ void ModuleBitcodeWriter::writeAttributeGroupTable() { Record.push_back(1); Record.push_back(getAttrKindEncoding(Attr.getKindAsEnum())); Record.push_back(Attr.getValueAsInt()); - } else if (Attr.isStringAttribute()) { + } else { StringRef Kind = Attr.getKindAsString(); StringRef Val = Attr.getValueAsString(); @@ -758,13 +758,6 @@ void ModuleBitcodeWriter::writeAttributeGroupTable() { Record.append(Val.begin(), Val.end()); Record.push_back(0); } - } else { - assert(Attr.isTypeAttribute()); - Type *Ty = Attr.getValueAsType(); - Record.push_back(Ty ? 6 : 5); - Record.push_back(getAttrKindEncoding(Attr.getKindAsEnum())); - if (Ty) - Record.push_back(VE.getTypeID(Attr.getValueAsType())); } } @@ -4133,15 +4126,15 @@ void ModuleBitcodeWriter::write() { // Emit blockinfo, which defines the standard abbreviations etc. writeBlockInfo(); - // Emit information describing all of the types in the module. - writeTypeTable(); - // Emit information about attribute groups. writeAttributeGroupTable(); // Emit information about parameter attributes. writeAttributeTable(); + // Emit information describing all of the types in the module. + writeTypeTable(); + writeComdats(); // Emit top-level description of module, including target triple, inline asm, diff --git a/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp b/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp index 143570fb20a..72d7000fad9 100644 --- a/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp +++ b/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp @@ -949,11 +949,9 @@ void ValueEnumerator::incorporateFunction(const Function &F) { incorporateFunctionMetadata(F); // Adding function arguments to the value table. - for (const auto &I : F.args()) { + for (const auto &I : F.args()) EnumerateValue(&I); - if (I.hasAttribute(Attribute::ByVal) && I.getParamByValType()) - EnumerateType(I.getParamByValType()); - } + FirstFuncConstantID = Values.size(); // Add all function-level constants to the value table. diff --git a/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp b/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp index 93727406a08..f144b18aa63 100644 --- a/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp +++ b/llvm/lib/CodeGen/GlobalISel/CallLowering.cpp @@ -87,10 +87,7 @@ void CallLowering::setArgFlags(CallLowering::ArgInfo &Arg, unsigned OpIdx, if (Arg.Flags.isByVal() || Arg.Flags.isInAlloca()) { Type *ElementTy = cast<PointerType>(Arg.Ty)->getElementType(); - - auto Ty = Attrs.getAttribute(OpIdx, Attribute::ByVal).getValueAsType(); - Arg.Flags.setByValSize(DL.getTypeAllocSize(Ty ? Ty : ElementTy)); - + Arg.Flags.setByValSize(DL.getTypeAllocSize(ElementTy)); // For ByVal, alignment should be passed from FE. BE will guess if // this info is not there but there are cases it cannot get right. unsigned FrameAlign; diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp index d887ed73c44..8fb1a7b5bb9 100644 --- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -1204,11 +1204,9 @@ bool FastISel::lowerCallTo(CallLoweringInfo &CLI) { if (Arg.IsByVal || Arg.IsInAlloca) { PointerType *Ty = cast<PointerType>(Arg.Ty); Type *ElementTy = Ty->getElementType(); - unsigned FrameSize = - DL.getTypeAllocSize(Arg.ByValType ? Arg.ByValType : ElementTy); - - // For ByVal, alignment should come from FE. BE will guess if this info - // is not there, but there are cases it cannot get right. + unsigned FrameSize = DL.getTypeAllocSize(ElementTy); + // For ByVal, alignment should come from FE. BE will guess if this info is + // not there, but there are cases it cannot get right. unsigned FrameAlign = Arg.Alignment; if (!FrameAlign) FrameAlign = TLI.getByValTypeAlignment(ElementTy, DL); diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index da06ac7a414..fe857f73b25 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -9076,11 +9076,8 @@ TargetLowering::LowerCallTo(TargetLowering::CallLoweringInfo &CLI) const { if (Args[i].IsByVal || Args[i].IsInAlloca) { PointerType *Ty = cast<PointerType>(Args[i].Ty); Type *ElementTy = Ty->getElementType(); - - unsigned FrameSize = DL.getTypeAllocSize( - Args[i].ByValType ? Args[i].ByValType : ElementTy); - Flags.setByValSize(FrameSize); - + Flags.setByValSize(DL.getTypeAllocSize(ElementTy)); + // For ByVal, alignment should come from FE. BE will guess if this // info is not there but there are cases it cannot get right. unsigned FrameAlign; if (Args[i].Alignment) @@ -9577,14 +9574,9 @@ void SelectionDAGISel::LowerArguments(const Function &F) { if (Flags.isByVal() || Flags.isInAlloca()) { PointerType *Ty = cast<PointerType>(Arg.getType()); Type *ElementTy = Ty->getElementType(); - - // For ByVal, size and alignment should be passed from FE. BE will - // guess if this info is not there but there are cases it cannot get - // right. - unsigned FrameSize = DL.getTypeAllocSize( - Arg.getParamByValType() ? Arg.getParamByValType() : ElementTy); - Flags.setByValSize(FrameSize); - + Flags.setByValSize(DL.getTypeAllocSize(ElementTy)); + // For ByVal, alignment should be passed from FE. BE will guess if + // this info is not there but there are cases it cannot get right. unsigned FrameAlign; if (Arg.getParamAlignment()) FrameAlign = Arg.getParamAlignment(); diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index 4ad578d80fa..d636e613363 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -112,7 +112,6 @@ void TargetLoweringBase::ArgListEntry::setAttributes(const CallBase *Call, IsSwiftSelf = Call->paramHasAttr(ArgIdx, Attribute::SwiftSelf); IsSwiftError = Call->paramHasAttr(ArgIdx, Attribute::SwiftError); Alignment = Call->getParamAlignment(ArgIdx); - ByValType = Call->getParamByValType(ArgIdx); } /// Generate a libcall taking the given operands as arguments and returning a diff --git a/llvm/lib/IR/AttributeImpl.h b/llvm/lib/IR/AttributeImpl.h index f6898476382..8ebcb04a565 100644 --- a/llvm/lib/IR/AttributeImpl.h +++ b/llvm/lib/IR/AttributeImpl.h @@ -29,7 +29,6 @@ namespace llvm { class LLVMContext; -class Type; //===----------------------------------------------------------------------===// /// \class @@ -42,8 +41,7 @@ protected: enum AttrEntryKind { EnumAttrEntry, IntAttrEntry, - StringAttrEntry, - TypeAttrEntry, + StringAttrEntry }; AttributeImpl(AttrEntryKind KindID) : KindID(KindID) {} @@ -58,7 +56,6 @@ public: bool isEnumAttribute() const { return KindID == EnumAttrEntry; } bool isIntAttribute() const { return KindID == IntAttrEntry; } bool isStringAttribute() const { return KindID == StringAttrEntry; } - bool isTypeAttribute() const { return KindID == TypeAttrEntry; } bool hasAttribute(Attribute::AttrKind A) const; bool hasAttribute(StringRef Kind) const; @@ -69,20 +66,16 @@ public: StringRef getKindAsString() const; StringRef getValueAsString() const; - Type *getValueAsType() const; - /// Used when sorting the attributes. bool operator<(const AttributeImpl &AI) const; void Profile(FoldingSetNodeID &ID) const { if (isEnumAttribute()) - Profile(ID, getKindAsEnum(), static_cast<uint64_t>(0)); + Profile(ID, getKindAsEnum(), 0); else if (isIntAttribute()) Profile(ID, getKindAsEnum(), getValueAsInt()); - else if (isStringAttribute()) - Profile(ID, getKindAsString(), getValueAsString()); else - Profile(ID, getKindAsEnum(), getValueAsType()); + Profile(ID, getKindAsString(), getValueAsString()); } static void Profile(FoldingSetNodeID &ID, Attribute::AttrKind Kind, @@ -95,12 +88,6 @@ public: ID.AddString(Kind); if (!Values.empty()) ID.AddString(Values); } - - static void Profile(FoldingSetNodeID &ID, Attribute::AttrKind Kind, - Type *Ty) { - ID.AddInteger(Kind); - ID.AddPointer(Ty); - } }; //===----------------------------------------------------------------------===// @@ -158,18 +145,6 @@ public: StringRef getStringValue() const { return Val; } }; -class TypeAttributeImpl : public EnumAttributeImpl { - virtual void anchor(); - - Type *Ty; - -public: - TypeAttributeImpl(Attribute::AttrKind Kind, Type *Ty) - : EnumAttributeImpl(TypeAttrEntry, Kind), Ty(Ty) {} - - Type *getTypeValue() const { return Ty; } -}; - //===----------------------------------------------------------------------===// /// \class /// This class represents a group of attributes that apply to one @@ -214,7 +189,6 @@ public: uint64_t getDereferenceableOrNullBytes() const; std::pair<unsigned, Optional<unsigned>> getAllocSizeArgs() const; std::string getAsString(bool InAttrGrp) const; - Type *getByValType() const; using iterator = const Attribute *; diff --git a/llvm/lib/IR/Attributes.cpp b/llvm/lib/IR/Attributes.cpp index 839ef46b4f4..0be09a05e82 100644 --- a/llvm/lib/IR/Attributes.cpp +++ b/llvm/lib/IR/Attributes.cpp @@ -121,27 +121,6 @@ Attribute Attribute::get(LLVMContext &Context, StringRef Kind, StringRef Val) { return Attribute(PA); } -Attribute Attribute::get(LLVMContext &Context, Attribute::AttrKind Kind, - Type *Ty) { - LLVMContextImpl *pImpl = Context.pImpl; - FoldingSetNodeID ID; - ID.AddInteger(Kind); - ID.AddPointer(Ty); - - void *InsertPoint; - AttributeImpl *PA = pImpl->AttrsSet.FindNodeOrInsertPos(ID, InsertPoint); - - if (!PA) { - // If we didn't find any existing attributes of the same shape then create a - // new one and insert it. - PA = new TypeAttributeImpl(Kind, Ty); - pImpl->AttrsSet.InsertNode(PA, InsertPoint); - } - - // Return the Attribute that we found or created. - return Attribute(PA); -} - Attribute Attribute::getWithAlignment(LLVMContext &Context, uint64_t Align) { assert(isPowerOf2_32(Align) && "Alignment must be a power of two."); assert(Align <= 0x40000000 && "Alignment too large."); @@ -167,10 +146,6 @@ Attribute Attribute::getWithDereferenceableOrNullBytes(LLVMContext &Context, return get(Context, DereferenceableOrNull, Bytes); } -Attribute Attribute::getWithByValType(LLVMContext &Context, Type *Ty) { - return get(Context, ByVal, Ty); -} - Attribute Attribute::getWithAllocSizeArgs(LLVMContext &Context, unsigned ElemSizeArg, const Optional<unsigned> &NumElemsArg) { @@ -195,13 +170,9 @@ bool Attribute::isStringAttribute() const { return pImpl && pImpl->isStringAttribute(); } -bool Attribute::isTypeAttribute() const { - return pImpl && pImpl->isTypeAttribute(); -} - Attribute::AttrKind Attribute::getKindAsEnum() const { if (!pImpl) return None; - assert((isEnumAttribute() || isIntAttribute() || isTypeAttribute()) && + assert((isEnumAttribute() || isIntAttribute()) && "Invalid attribute type to get the kind as an enum!"); return pImpl->getKindAsEnum(); } @@ -227,14 +198,6 @@ StringRef Attribute::getValueAsString() const { return pImpl->getValueAsString(); } -Type *Attribute::getValueAsType() const { - if (!pImpl) return {}; - assert(isTypeAttribute() && - "Invalid attribute type to get the value as a type!"); - return pImpl->getValueAsType(); -} - - bool Attribute::hasAttribute(AttrKind Kind) const { return (pImpl && pImpl->hasAttribute(Kind)) || (!pImpl && Kind == None); } @@ -289,6 +252,8 @@ std::string Attribute::getAsString(bool InAttrGrp) const { return "argmemonly"; if (hasAttribute(Attribute::Builtin)) return "builtin"; + if (hasAttribute(Attribute::ByVal)) + return "byval"; if (hasAttribute(Attribute::Convergent)) return "convergent"; if (hasAttribute(Attribute::SwiftError)) @@ -388,19 +353,6 @@ std::string Attribute::getAsString(bool InAttrGrp) const { if (hasAttribute(Attribute::ImmArg)) return "immarg"; - if (hasAttribute(Attribute::ByVal)) { - std::string Result; - Result += "byval"; - if (Type *Ty = getValueAsType()) { - raw_string_ostream OS(Result); - Result += '('; - Ty->print(OS, false, true); - OS.flush(); - Result += ')'; - } - return Result; - } - // FIXME: These should be output like this: // // align=4 @@ -499,8 +451,6 @@ void IntAttributeImpl::anchor() {} void StringAttributeImpl::anchor() {} -void TypeAttributeImpl::anchor() {} - bool AttributeImpl::hasAttribute(Attribute::AttrKind A) const { if (isStringAttribute()) return false; return getKindAsEnum() == A; @@ -512,7 +462,7 @@ bool AttributeImpl::hasAttribute(StringRef Kind) const { } Attribute::AttrKind AttributeImpl::getKindAsEnum() const { - assert(isEnumAttribute() || isIntAttribute() || isTypeAttribute()); + assert(isEnumAttribute() || isIntAttribute()); return static_cast<const EnumAttributeImpl *>(this)->getEnumKind(); } @@ -531,11 +481,6 @@ StringRef AttributeImpl::getValueAsString() const { return static_cast<const StringAttributeImpl *>(this)->getStringValue(); } -Type *AttributeImpl::getValueAsType() const { - assert(isTypeAttribute()); - return static_cast<const TypeAttributeImpl *>(this)->getTypeValue(); -} - bool AttributeImpl::operator<(const AttributeImpl &AI) const { // This sorts the attributes with Attribute::AttrKinds coming first (sorted // relative to their enum value) and then strings. @@ -543,23 +488,10 @@ bool AttributeImpl::operator<(const AttributeImpl &AI) const { if (AI.isEnumAttribute()) return getKindAsEnum() < AI.getKindAsEnum(); if (AI.isIntAttribute()) return true; if (AI.isStringAttribute()) return true; - if (AI.isTypeAttribute()) return true; - } - - if (isTypeAttribute()) { - if (AI.isEnumAttribute()) return false; - if (AI.isTypeAttribute()) { - assert(getKindAsEnum() != AI.getKindAsEnum() && - "Comparison of types would be unstable"); - return getKindAsEnum() < AI.getKindAsEnum(); - } - if (AI.isIntAttribute()) return true; - if (AI.isStringAttribute()) return true; } if (isIntAttribute()) { if (AI.isEnumAttribute()) return false; - if (AI.isTypeAttribute()) return false; if (AI.isIntAttribute()) { if (getKindAsEnum() == AI.getKindAsEnum()) return getValueAsInt() < AI.getValueAsInt(); @@ -568,9 +500,7 @@ bool AttributeImpl::operator<(const AttributeImpl &AI) const { if (AI.isStringAttribute()) return true; } - assert(isStringAttribute()); if (AI.isEnumAttribute()) return false; - if (AI.isTypeAttribute()) return false; if (AI.isIntAttribute()) return false; if (getKindAsString() == AI.getKindAsString()) return getValueAsString() < AI.getValueAsString(); @@ -678,10 +608,6 @@ uint64_t AttributeSet::getDereferenceableOrNullBytes() const { return SetNode ? SetNode->getDereferenceableOrNullBytes() : 0; } -Type *AttributeSet::getByValType() const { - return SetNode ? SetNode->getByValType() : nullptr; -} - std::pair<unsigned, Optional<unsigned>> AttributeSet::getAllocSizeArgs() const { return SetNode ? SetNode->getAllocSizeArgs() : std::pair<unsigned, Optional<unsigned>>(0, 0); @@ -765,9 +691,6 @@ AttributeSetNode *AttributeSetNode::get(LLVMContext &C, const AttrBuilder &B) { Attribute Attr; switch (Kind) { - case Attribute::ByVal: - Attr = Attribute::getWithByValType(C, B.getByValType()); - break; case Attribute::Alignment: Attr = Attribute::getWithAlignment(C, B.getAlignment()); break; @@ -837,13 +760,6 @@ unsigned AttributeSetNode::getStackAlignment() const { return 0; } -Type *AttributeSetNode::getByValType() const { - for (const auto I : *this) - if (I.hasAttribute(Attribute::ByVal)) - return I.getValueAsType(); - return 0; -} - uint64_t AttributeSetNode::getDereferenceableBytes() const { for (const auto I : *this) if (I.hasAttribute(Attribute::Dereferenceable)) @@ -1342,11 +1258,6 @@ unsigned AttributeList::getParamAlignment(unsigned ArgNo) const { return getAttributes(ArgNo + FirstArgIndex).getAlignment(); } -Type *AttributeList::getParamByValType(unsigned Index) const { - return getAttributes(Index+FirstArgIndex).getByValType(); -} - - unsigned AttributeList::getStackAlignment(unsigned Index) const { return getAttributes(Index).getStackAlignment(); } @@ -1425,7 +1336,6 @@ void AttrBuilder::clear() { TargetDepAttrs.clear(); Alignment = StackAlignment = DerefBytes = DerefOrNullBytes = 0; AllocSizeArgs = 0; - ByValType = nullptr; } AttrBuilder &AttrBuilder::addAttribute(Attribute::AttrKind Val) { @@ -1450,8 +1360,6 @@ AttrBuilder &AttrBuilder::addAttribute(Attribute Attr) { Alignment = Attr.getAlignment(); else if (Kind == Attribute::StackAlignment) StackAlignment = Attr.getStackAlignment(); - else if (Kind == Attribute::ByVal) - ByValType = Attr.getValueAsType(); else if (Kind == Attribute::Dereferenceable) DerefBytes = Attr.getDereferenceableBytes(); else if (Kind == Attribute::DereferenceableOrNull) @@ -1474,8 +1382,6 @@ AttrBuilder &AttrBuilder::removeAttribute(Attribute::AttrKind Val) { Alignment = 0; else if (Val == Attribute::StackAlignment) StackAlignment = 0; - else if (Val == Attribute::ByVal) - ByValType = nullptr; else if (Val == Attribute::Dereferenceable) DerefBytes = 0; else if (Val == Attribute::DereferenceableOrNull) @@ -1558,12 +1464,6 @@ AttrBuilder &AttrBuilder::addAllocSizeAttrFromRawRepr(uint64_t RawArgs) { return *this; } -AttrBuilder &AttrBuilder::addByValAttr(Type *Ty) { - Attrs[Attribute::ByVal] = true; - ByValType = Ty; - return *this; -} - AttrBuilder &AttrBuilder::merge(const AttrBuilder &B) { // FIXME: What if both have alignments, but they don't match?! if (!Alignment) diff --git a/llvm/lib/IR/Function.cpp b/llvm/lib/IR/Function.cpp index a4a78ca4deb..b00deb677b3 100644 --- a/llvm/lib/IR/Function.cpp +++ b/llvm/lib/IR/Function.cpp @@ -113,11 +113,6 @@ unsigned Argument::getParamAlignment() const { return getParent()->getParamAlignment(getArgNo()); } -Type *Argument::getParamByValType() const { - assert(getType()->isPointerTy() && "Only pointers have byval types"); - return getParent()->getParamByValType(getArgNo()); -} - uint64_t Argument::getDereferenceableBytes() const { assert(getType()->isPointerTy() && "Only pointers have dereferenceable bytes"); diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index 963bf82c989..d5c3287e713 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -1695,11 +1695,6 @@ void Verifier::verifyParameterAttrs(AttributeSet Attrs, Type *Ty, "'noinline and alwaysinline' are incompatible!", V); - if (Attrs.hasAttribute(Attribute::ByVal) && Attrs.getByValType()) { - Assert(Attrs.getByValType() == cast<PointerType>(Ty)->getElementType(), - "Attribute 'byval' type does not match parameter!"); - } - AttrBuilder IncompatibleAttrs = AttributeFuncs::typeIncompatible(Ty); Assert(!AttrBuilder(Attrs).overlaps(IncompatibleAttrs), "Wrong types for attribute: " + diff --git a/llvm/test/Assembler/byval-type-attr.ll b/llvm/test/Assembler/byval-type-attr.ll deleted file mode 100644 index eb17a30db3b..00000000000 --- a/llvm/test/Assembler/byval-type-attr.ll +++ /dev/null @@ -1,31 +0,0 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s - -; CHECK: define void @foo(i32* byval(i32) align 4) -define void @foo(i32* byval(i32) align 4) { - ret void -} - -; CHECK: define void @bar({ i32*, i8 }* byval({ i32*, i8 }) align 4) -define void @bar({i32*, i8}* byval({i32*, i8}) align 4) { - ret void -} - -define void @caller({ i32*, i8 }* %ptr) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) { -; CHECK: call void @bar({ i32*, i8 }* byval({ i32*, i8 }) %ptr) -; CHECK: invoke void @bar({ i32*, i8 }* byval({ i32*, i8 }) %ptr) - call void @bar({i32*, i8}* byval %ptr) - invoke void @bar({i32*, i8}* byval %ptr) to label %success unwind label %fail - -success: - ret void - -fail: - landingpad { i8*, i32 } cleanup - ret void -} - -; CHECK: declare void @baz([8 x i8]* byval([8 x i8])) -%named_type = type [8 x i8] -declare void @baz(%named_type* byval(%named_type)) - -declare i32 @__gxx_personality_v0(...) diff --git a/llvm/test/Assembler/invalid-byval-type1.ll b/llvm/test/Assembler/invalid-byval-type1.ll deleted file mode 100644 index 236790e1142..00000000000 --- a/llvm/test/Assembler/invalid-byval-type1.ll +++ /dev/null @@ -1,4 +0,0 @@ -; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s - -; CHECK: Attribute 'byval' type does not match parameter! -declare void @foo(i32* byval(i8)) diff --git a/llvm/test/Assembler/invalid-byval-type2.ll b/llvm/test/Assembler/invalid-byval-type2.ll deleted file mode 100644 index 3ca0d5e7c4c..00000000000 --- a/llvm/test/Assembler/invalid-byval-type2.ll +++ /dev/null @@ -1,4 +0,0 @@ -; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s - -; CHECK: error: void type only allowed for function results -declare void @foo(i32* byval(void)) diff --git a/llvm/test/Assembler/invalid-byval-type3.ll b/llvm/test/Assembler/invalid-byval-type3.ll deleted file mode 100644 index 4626dd71c5b..00000000000 --- a/llvm/test/Assembler/invalid-byval-type3.ll +++ /dev/null @@ -1,4 +0,0 @@ -; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s - -; CHECK: Attributes 'byval' and 'inalloca' do not support unsized types! -declare void @foo(void()* byval(void())) diff --git a/llvm/test/Bitcode/Inputs/byval-upgrade.bc b/llvm/test/Bitcode/Inputs/byval-upgrade.bc Binary files differdeleted file mode 100644 index e0da41f78e7..00000000000 --- a/llvm/test/Bitcode/Inputs/byval-upgrade.bc +++ /dev/null diff --git a/llvm/test/Bitcode/attributes-3.3.ll b/llvm/test/Bitcode/attributes-3.3.ll index f1b37d19912..b564425c373 100644 --- a/llvm/test/Bitcode/attributes-3.3.ll +++ b/llvm/test/Bitcode/attributes-3.3.ll @@ -48,7 +48,7 @@ define void @f7(i8* noalias) } define void @f8(i8* byval) -; CHECK: define void @f8(i8* byval(i8)) +; CHECK: define void @f8(i8* byval) { ret void; } diff --git a/llvm/test/Bitcode/attributes.ll b/llvm/test/Bitcode/attributes.ll index 6f149c0d3bf..de3cf8dd4d7 100644 --- a/llvm/test/Bitcode/attributes.ll +++ b/llvm/test/Bitcode/attributes.ll @@ -45,7 +45,7 @@ define void @f7(i8* noalias) } define void @f8(i8* byval) -; CHECK: define void @f8(i8* byval(i8)) +; CHECK: define void @f8(i8* byval) { ret void; } diff --git a/llvm/test/Bitcode/byval-upgrade.test b/llvm/test/Bitcode/byval-upgrade.test deleted file mode 100644 index 1012bf72883..00000000000 --- a/llvm/test/Bitcode/byval-upgrade.test +++ /dev/null @@ -1,7 +0,0 @@ -RUN: llvm-dis %p/Inputs/byval-upgrade.bc -o - | FileCheck %s - -Make sure we upgrade old-stile IntAttribute byval records to a fully typed -version correctly. - -CHECK: call void @bar({ i32*, i8 }* byval({ i32*, i8 }) %ptr) -CHECK: invoke void @bar({ i32*, i8 }* byval({ i32*, i8 }) %ptr) diff --git a/llvm/test/Bitcode/compatibility-3.6.ll b/llvm/test/Bitcode/compatibility-3.6.ll index 322c95b02d1..e9313dfba87 100644 --- a/llvm/test/Bitcode/compatibility-3.6.ll +++ b/llvm/test/Bitcode/compatibility-3.6.ll @@ -404,7 +404,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility-3.7.ll b/llvm/test/Bitcode/compatibility-3.7.ll index e8260741373..82fc9905535 100644 --- a/llvm/test/Bitcode/compatibility-3.7.ll +++ b/llvm/test/Bitcode/compatibility-3.7.ll @@ -410,7 +410,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility-3.8.ll b/llvm/test/Bitcode/compatibility-3.8.ll index c8d82619155..2e70a380d10 100644 --- a/llvm/test/Bitcode/compatibility-3.8.ll +++ b/llvm/test/Bitcode/compatibility-3.8.ll @@ -435,7 +435,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility-3.9.ll b/llvm/test/Bitcode/compatibility-3.9.ll index f031e54a9f2..7c84daa7d3c 100644 --- a/llvm/test/Bitcode/compatibility-3.9.ll +++ b/llvm/test/Bitcode/compatibility-3.9.ll @@ -504,7 +504,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility-4.0.ll b/llvm/test/Bitcode/compatibility-4.0.ll index 8020df45da6..9e34d48c95f 100644 --- a/llvm/test/Bitcode/compatibility-4.0.ll +++ b/llvm/test/Bitcode/compatibility-4.0.ll @@ -504,7 +504,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility-5.0.ll b/llvm/test/Bitcode/compatibility-5.0.ll index 3b32d668af5..a4b3fca82b7 100644 --- a/llvm/test/Bitcode/compatibility-5.0.ll +++ b/llvm/test/Bitcode/compatibility-5.0.ll @@ -508,7 +508,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility-6.0.ll b/llvm/test/Bitcode/compatibility-6.0.ll index 3b08c4a7231..097e19ecb7f 100644 --- a/llvm/test/Bitcode/compatibility-6.0.ll +++ b/llvm/test/Bitcode/compatibility-6.0.ll @@ -515,7 +515,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) diff --git a/llvm/test/Bitcode/compatibility.ll b/llvm/test/Bitcode/compatibility.ll index 991bde69b61..06b81fa14a8 100644 --- a/llvm/test/Bitcode/compatibility.ll +++ b/llvm/test/Bitcode/compatibility.ll @@ -529,7 +529,7 @@ declare void @f.param.signext(i8 signext) declare void @f.param.inreg(i8 inreg) ; CHECK: declare void @f.param.inreg(i8 inreg) declare void @f.param.byval({ i8, i8 }* byval) -; CHECK: declare void @f.param.byval({ i8, i8 }* byval({ i8, i8 })) +; CHECK: declare void @f.param.byval({ i8, i8 }* byval) declare void @f.param.inalloca(i8* inalloca) ; CHECK: declare void @f.param.inalloca(i8* inalloca) declare void @f.param.sret(i8* sret) @@ -1735,15 +1735,6 @@ define i8** @constexpr() { declare void @llvm.test.immarg.intrinsic(i32 immarg) ; CHECK: declare void @llvm.test.immarg.intrinsic(i32 immarg) -; byval attribute with type -%named_type = type [8 x i8] -declare void @byval_type(i32* byval(i32) align 2) -declare void @byval_type2({ i8, i8* }* byval({ i8, i8* })) -declare void @byval_named_type(%named_type* byval(%named_type)) -; CHECK: declare void @byval_type(i32* byval(i32) align 2) -; CHECK: declare void @byval_type2({ i8, i8* }* byval({ i8, i8* })) -; CHECK: declare void @byval_named_type([8 x i8]* byval([8 x i8])) - ; CHECK: attributes #0 = { alignstack=4 } ; CHECK: attributes #1 = { alignstack=8 } ; CHECK: attributes #2 = { alwaysinline } diff --git a/llvm/test/Bitcode/highLevelStructure.3.2.ll b/llvm/test/Bitcode/highLevelStructure.3.2.ll index 91d6ee4ac25..749b157cffc 100644 --- a/llvm/test/Bitcode/highLevelStructure.3.2.ll +++ b/llvm/test/Bitcode/highLevelStructure.3.2.ll @@ -41,7 +41,7 @@ declare void @ParamAttr3(i8* sret) declare void @ParamAttr4(i8 signext) ; CHECK: declare void @ParamAttr5(i8* inreg) declare void @ParamAttr5(i8* inreg) -; CHECK: declare void @ParamAttr6(i8* byval(i8)) +; CHECK: declare void @ParamAttr6(i8* byval) declare void @ParamAttr6(i8* byval) ; CHECK: declare void @ParamAttr7(i8* noalias) declare void @ParamAttr7(i8* noalias) @@ -51,7 +51,7 @@ declare void @ParamAttr8(i8* nocapture) declare void @ParamAttr9(i8* nest noalias nocapture) ; CHECK: declare void @ParamAttr10{{[(i8* sret noalias nocapture) | (i8* noalias nocapture sret)]}} declare void @ParamAttr10(i8* sret noalias nocapture) -;CHECK: declare void @ParamAttr11{{[(i8* byval(i8) noalias nocapture) | (i8* noalias nocapture byval(i8))]}} +;CHECK: declare void @ParamAttr11{{[(i8* byval noalias nocapture) | (i8* noalias nocapture byval)]}} declare void @ParamAttr11(i8* byval noalias nocapture) ;CHECK: declare void @ParamAttr12{{[(i8* inreg noalias nocapture) | (i8* noalias nocapture inreg)]}} declare void @ParamAttr12(i8* inreg noalias nocapture) diff --git a/llvm/test/CodeGen/AArch64/byval-type.ll b/llvm/test/CodeGen/AArch64/byval-type.ll deleted file mode 100644 index 0c2e2dc471d..00000000000 --- a/llvm/test/CodeGen/AArch64/byval-type.ll +++ /dev/null @@ -1,37 +0,0 @@ -; RUN: llc -mtriple=aarch64-linux-gnu %s -o - | FileCheck %s - -define i8 @byval_match(i8* byval(i8) align 1, i8* byval %ptr) { -; CHECK-LABEL: byval_match: -; CHECK: ldrb w0, [sp, #8] - %res = load i8, i8* %ptr - ret i8 %res -} - -define void @caller_match(i8* %p0, i8* %p1) { -; CHECK-LABEL: caller_match: -; CHECK: ldrb [[P1:w[0-9]+]], [x1] -; CHECK: strb [[P1]], [sp, #8] -; CHECK: ldrb [[P0:w[0-9]+]], [x0] -; CHECK: strb [[P0]], [sp] -; CHECK: bl byval_match - call i8 @byval_match(i8* byval(i8) align 1 %p0, i8* byval %p1) - ret void -} - -define i8 @byval_large([3 x i64]* byval([3 x i64]) align 8, i8* byval %ptr) { -; CHECK-LABEL: byval_large: -; CHECK: ldrb w0, [sp, #24] - %res = load i8, i8* %ptr - ret i8 %res -} - -define void @caller_large([3 x i64]* %p0, i8* %p1) { -; CHECK-LABEL: caller_large: -; CHECK: ldr [[P0HI:x[0-9]+]], [x0, #16] -; CHECK: ldr [[P0LO:q[0-9]+]], [x0] -; CHECK: str [[P0HI]], [sp, #16] -; CHECK: str [[P0LO]], [sp] -; CHECK: bl byval_large - call i8 @byval_large([3 x i64]* byval([3 x i64]) align 8 %p0, i8* byval %p1) - ret void -} diff --git a/llvm/test/Transforms/Inline/byval-tail-call.ll b/llvm/test/Transforms/Inline/byval-tail-call.ll index be495f1bcd3..8aafe7943f4 100644 --- a/llvm/test/Transforms/Inline/byval-tail-call.ll +++ b/llvm/test/Transforms/Inline/byval-tail-call.ll @@ -56,7 +56,7 @@ define void @foobar(i32* %x) { ; CHECK: %[[POS:.*]] = alloca i32 ; CHECK: %[[VAL:.*]] = load i32, i32* %x ; CHECK: store i32 %[[VAL]], i32* %[[POS]] -; CHECK: tail call void @ext2(i32* nonnull byval %[[POS]] +; CHECK: tail call void @ext2(i32* byval nonnull %[[POS]] ; CHECK: ret void tail call void @bar2(i32* byval %x) ret void @@ -67,7 +67,7 @@ define void @barfoo() { ; CHECK: %[[POS:.*]] = alloca i32 ; CHECK: %[[VAL:.*]] = load i32, i32* %x ; CHECK: store i32 %[[VAL]], i32* %[[POS]] -; CHECK: tail call void @ext2(i32* nonnull byval %[[POS]] +; CHECK: tail call void @ext2(i32* byval nonnull %[[POS]] ; CHECK: ret void %x = alloca i32 tail call void @bar2(i32* byval %x) diff --git a/llvm/unittests/IR/AttributesTest.cpp b/llvm/unittests/IR/AttributesTest.cpp index 06da35aca57..e0be2343a14 100644 --- a/llvm/unittests/IR/AttributesTest.cpp +++ b/llvm/unittests/IR/AttributesTest.cpp @@ -8,7 +8,6 @@ #include "llvm/IR/Attributes.h" #include "llvm/IR/LLVMContext.h" -#include "llvm/IR/DerivedTypes.h" #include "gtest/gtest.h" using namespace llvm; @@ -41,10 +40,6 @@ TEST(Attributes, Ordering) { EXPECT_TRUE(Align4 < Deref5); EXPECT_TRUE(Align5 < Deref4); - Attribute ByVal = Attribute::get(C, Attribute::ByVal, Type::getInt32Ty(C)); - EXPECT_FALSE(ByVal < Attribute::get(C, Attribute::ZExt)); - EXPECT_TRUE(ByVal < Align4); - AttributeList ASs[] = {AttributeList::get(C, 2, Attribute::ZExt), AttributeList::get(C, 1, Attribute::SExt)}; @@ -171,19 +166,4 @@ TEST(Attributes, OverflowGet) { EXPECT_EQ(2U, AL.getNumAttrSets()); } -TEST(Attributes, StringRepresentation) { - LLVMContext C; - StructType *Ty = StructType::create(Type::getInt32Ty(C), "mystruct"); - - // Insufficiently careful printing can result in byval(%mystruct = { i32 }) - Attribute A = Attribute::getWithByValType(C, Ty); - EXPECT_EQ(A.getAsString(), "byval(%mystruct)"); - - A = Attribute::getWithByValType(C, nullptr); - EXPECT_EQ(A.getAsString(), "byval"); - - A = Attribute::getWithByValType(C, Type::getInt32Ty(C)); - EXPECT_EQ(A.getAsString(), "byval(i32)"); -} - } // end anonymous namespace |
