commit b96129dd4856a5473c52daceaabdfd2262bd96f2
author Bill Wendling <isanbard@gmail.com> Thu Jan 31 01:04:51 2013 +0000
committer Bill Wendling <isanbard@gmail.com> Thu Jan 31 01:04:51 2013 +0000
tree b126ed8fdf918cdbd483c61513f9d3090482266c
parent 67dad63de642cb4d94928eae5d3568268e3398bd

Revert for now:

--- Reverse-merging r174010 into '.':
U    include/llvm/IR/Attributes.h
U    lib/IR/Verifier.cpp
U    lib/IR/Attributes.cpp



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174012 91177308-0d34-0410-b5e6-96231b3b80d8

lib/IR/Verifier.cpp

diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp
index babc295..5da7448 100644
--- a/lib/IR/Verifier.cpp
+++ b/lib/IR/Verifier.cpp
@@ -745,9 +745,7 @@
   AttrBuilder NotFn(Attrs, AttributeSet::FunctionIndex);
   NotFn.removeFunctionOnlyAttrs();
   Assert1(!NotFn.hasAttributes(), "Attribute '" +
-          AttributeSet::get(V->getContext(),
-                            AttributeSet::FunctionIndex,
-                            NotFn).getAsString(AttributeSet::FunctionIndex) +
+          Attribute::get(V->getContext(), NotFn).getAsString() +
           "' do not apply to the function!", V);
 
   // Check for mutually incompatible attributes.