From a9f15ce71f107768f25958e721008034398d6a3e Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 15 May 2014 23:58:57 +0000 Subject: [PATCH] musttail: Fix the verification of alignment attributes Previously this would fail with an assertion failure when trying to add an alignment attribute without a value. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208935 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Verifier.cpp | 27 ++++++++++++++++----------- test/Verifier/musttail-invalid.ll | 7 +++++++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index ec287f58fa3..ff9ca44f870 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -1567,6 +1567,20 @@ static bool isTypeCongruent(Type *L, Type *R) { return PL->getAddressSpace() == PR->getAddressSpace(); } +static AttrBuilder getParameterABIAttributes(int I, AttributeSet Attrs) { + static const Attribute::AttrKind ABIAttrs[] = { + Attribute::StructRet, Attribute::ByVal, Attribute::InAlloca, + Attribute::InReg, Attribute::Returned}; + AttrBuilder Copy; + for (auto AK : ABIAttrs) { + if (Attrs.hasAttribute(I + 1, AK)) + Copy.addAttribute(AK); + } + if (Attrs.hasAttribute(I + 1, Attribute::Alignment)) + Copy.addAlignmentAttr(Attrs.getParamAlignment(I + 1)); + return Copy; +} + void Verifier::verifyMustTailCall(CallInst &CI) { Assert1(!CI.isInlineAsm(), "cannot use musttail call with inline asm", &CI); @@ -1598,20 +1612,11 @@ void Verifier::verifyMustTailCall(CallInst &CI) { // - All ABI-impacting function attributes, such as sret, byval, inreg, // returned, and inalloca, must match. - static const Attribute::AttrKind ABIAttrs[] = { - Attribute::Alignment, Attribute::StructRet, Attribute::ByVal, - Attribute::InAlloca, Attribute::InReg, Attribute::Returned}; AttributeSet CallerAttrs = F->getAttributes(); AttributeSet CalleeAttrs = CI.getAttributes(); for (int I = 0, E = CallerTy->getNumParams(); I != E; ++I) { - AttrBuilder CallerABIAttrs; - AttrBuilder CalleeABIAttrs; - for (auto AK : ABIAttrs) { - if (CallerAttrs.hasAttribute(I + 1, AK)) - CallerABIAttrs.addAttribute(AK); - if (CalleeAttrs.hasAttribute(I + 1, AK)) - CalleeABIAttrs.addAttribute(AK); - } + AttrBuilder CallerABIAttrs = getParameterABIAttributes(I, CallerAttrs); + AttrBuilder CalleeABIAttrs = getParameterABIAttributes(I, CalleeAttrs); Assert2(CallerABIAttrs == CalleeABIAttrs, "cannot guarantee tail call due to mismatched ABI impacting " "function attributes", &CI, CI.getOperand(I)); diff --git a/test/Verifier/musttail-invalid.ll b/test/Verifier/musttail-invalid.ll index 7e427b50465..e5f9a404b9e 100644 --- a/test/Verifier/musttail-invalid.ll +++ b/test/Verifier/musttail-invalid.ll @@ -60,6 +60,13 @@ define void @mismatched_sret(i32* %a) { ret void } +declare void @mismatched_alignment_callee(i32* byval align 8) +define void @mismatched_alignment(i32* byval align 4 %a) { +; CHECK: mismatched ABI impacting function attributes + musttail call void @mismatched_alignment_callee(i32* byval align 8 %a) + ret void +} + declare i32 @not_tail_pos_callee() define i32 @not_tail_pos() { ; CHECK: musttail call must be precede a ret with an optional bitcast -- 2.34.1