Improve error messages for attributes in the wrong context.

[nickwasmer]

Summary

verifyFunctionAttrs has a comment that the value V is printed in error messages. The recently added errors for attributes didn't print V. Make them print V.

Change the stringification of AttributeList. Firstly they started with 'PAL[' which stood for ParamAttrsList. Change that to 'AttributeList[' matching its current name AttributeList. Print out semantic meaning of the index instead of the raw index value (i.e. 'return', 'function' or 'arg(n)').

[dexonsmith]

Seems like a nice improvement. LGTM, with one style nit inline.

llvm/lib/IR/Attributes.cpp

1699–1712

I suggest reducing nesting with an early continue here.

llvm/lib/IR/Attributes.cpp

 // AttributeList Introspection Methods
 //===----------------------------------------------------------------------===//
 
 unsigned AttributeList::getNumAttrSets() const {
   return pImpl ? pImpl->NumAttrSets : 0;
 }
 
 void AttributeList::print(raw_ostream &O) const {
-  O << "PAL[\n";
+  O << "AttributeList[\n";
 
   for (unsigned i = index_begin(), e = index_end(); i != e; ++i) {
-    if (getAttributes(i).hasAttributes())
-      O << "  { " << i << " => " << getAsString(i) << " }\n";
+    if (!getAttributes(i).hasAttributes())
+      continue;
+    O << "  { ";
+    switch (i) {
+    case AttrIndex::ReturnIndex:
+      O << "return";
+      break;
+    case AttrIndex::FunctionIndex:
+      O << "function";
+      break;
+    default:
+      O << "arg(" << i - AttrIndex::FirstArgIndex << ")";
+    }
+    O << " => " << getAsString(i) << " }\n";
   }
 
   O << "]\n";
 }
 
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
 LLVM_DUMP_METHOD void AttributeList::dump() const { print(dbgs()); }
 #endif

llvm/lib/IR/Verifier.cpp

 // The value V is printed in error messages.
 void Verifier::verifyFunctionAttrs(FunctionType *FT, AttributeList Attrs,
                                    const Value *V, bool IsIntrinsic) {
   if (Attrs.isEmpty())
     return;
 
   if (AttributeListsVisited.insert(Attrs.getRawPointer()).second) {
     Assert(Attrs.hasParentContext(Context),
-           "Attribute list does not match Module context!", &Attrs);
+           "Attribute list does not match Module context!", &Attrs, V);
     for (const auto &AttrSet : Attrs) {
       Assert(!AttrSet.hasAttributes() || AttrSet.hasParentContext(Context),
-             "Attribute set does not match Module context!", &AttrSet);
+             "Attribute set does not match Module context!", &AttrSet, V);
       for (const auto &A : AttrSet) {
         Assert(A.hasParentContext(Context),
-               "Attribute does not match Module context!", &A);
+               "Attribute does not match Module context!", &A, V);
       }
     }
   }
 
   bool SawNest = false;
   bool SawReturned = false;
   bool SawSRet = false;
   bool SawSwiftSelf = false;

llvm/unittests/IR/AttributesTest.cpp

LLVMContext C1, C2;
     AttributeList AL2 = AttributeList::get(C2, 1, Attribute::ZExt);
     EXPECT_TRUE(AL1.hasParentContext(C1));
     EXPECT_FALSE(AL1.hasParentContext(C2));
     EXPECT_FALSE(AL2.hasParentContext(C1));
     EXPECT_TRUE(AL2.hasParentContext(C2));
   }
 }
 
+TEST(Attributes, AttributeListPrinting) {
+  LLVMContext C;
+
+  {
+    std::string S;
+    raw_string_ostream OS(S);
+    AttributeList AL;
+    AL.addAttribute(C, AttributeList::FunctionIndex, Attribute::AlwaysInline)
+        .print(OS);
+    EXPECT_EQ(S, "AttributeList[\n"
+                 "  { function => alwaysinline }\n"
+                 "]\n");
+  }
+
+  {
+    std::string S;
+    raw_string_ostream OS(S);
+    AttributeList AL;
+    AL.addAttribute(C, AttributeList::ReturnIndex, Attribute::SExt).print(OS);
+    EXPECT_EQ(S, "AttributeList[\n"
+                 "  { return => signext }\n"
+                 "]\n");
+  }
+
+  {
+    std::string S;
+    raw_string_ostream OS(S);
+    AttributeList AL;
+    AL.addParamAttribute(C, 5, Attribute::ZExt).print(OS);
+    EXPECT_EQ(S, "AttributeList[\n"
+                 "  { arg(5) => zeroext }\n"
+                 "]\n");
+  }
+}
+
 } // end anonymous namespace