Merge commit 'c8e4b536771e' from llvm.org/master into apple/master

Author: git apple-llvm automerger

llvm/unittests/Transforms/Utils/VFABIUtils.cpp

@@ -46,8 +46,6 @@ TEST_F(VFABIAttrTest, Write) {
   Mappings.push_back("_ZGVnN8v_g");
   Mappings.push_back("_ZGVnN2v_g(custom_vg)");
   VFABI::setVectorVariantNames(CI, Mappings);
-  const AttributeList Attrs = CI->getAttributes();
-  const AttributeSet FnAttrs = Attrs.getFnAttributes();
   const StringRef S = CI->getAttribute(AttributeList::FunctionIndex,
                                        "vector-function-abi-variant")
                           .getValueAsString();