From: Bill Wendling <isanbard@gmail.com>
Date: Sun, 27 Jan 2013 00:36:48 +0000 (+0000)
Subject: Use the AttributeSet instead of AttributeWithIndex object.
X-Git-Tag: android-x86-6.0-r1~167^2~1090
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0c2f0ff9ccee3d711893b963b1dd8426beb7ddfe;p=android-x86%2Fexternal-llvm.git

Use the AttributeSet instead of AttributeWithIndex object.

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

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 4190161b62e..2e1a5125fe9 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -437,7 +437,7 @@ bool BitcodeReader::ParseAttributeBlock() {
 
   SmallVector<uint64_t, 64> Record;
 
-  SmallVector<AttributeWithIndex, 8> Attrs;
+  SmallVector<AttributeSet, 8> Attrs;
 
   // Read all the records.
   while (1) {
@@ -472,8 +472,7 @@ bool BitcodeReader::ParseAttributeBlock() {
       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
         AttrBuilder B(Record[i+1]);
         if (B.hasAttributes())
-          Attrs.push_back(AttributeWithIndex::get(Record[i],
-                                                  Attribute::get(Context, B)));
+          Attrs.push_back(AttributeSet::get(Context, Record[i], B));
       }
 
       MAttributes.push_back(AttributeSet::get(Context, Attrs));