commit 5a4041e7282ca1dba93fe1a97c8260c0ef621f5d
author Bill Wendling <isanbard@gmail.com> Fri Feb 01 22:32:30 2013 +0000
committer Bill Wendling <isanbard@gmail.com> Fri Feb 01 22:32:30 2013 +0000
tree 9935c2330dd4c2bbd88aaee9bc89934b4ff61873
parent 83474ee594b5b14e9071564814a90571805cc433

Change the AttributeImpl to hold a single Constant* for the values.

This Constant could be an aggregate to represent multiple values.


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

lib/IR/Attributes.cpp

diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 412d83e..f8ca9f1 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -84,8 +84,8 @@
   return pImpl ? pImpl->getAttributeKind() : 0;
 }
 
-ArrayRef<Constant*> Attribute::getAttributeValues() const {
-  return pImpl ? pImpl->getAttributeValues() : ArrayRef<Constant*>();
+Constant *Attribute::getAttributeValues() const {
+  return pImpl ? pImpl->getAttributeValues() : 0;
 }
 
 /// This returns the alignment field of an attribute as a byte alignment value.
@@ -186,24 +186,22 @@
   //
   //   "kind"
   //   "kind" = "value"
-  //   "kind" = ("value1" "value2" "value3" )
+  //   "kind" = ( "value1" "value2" "value3" )
   //
   if (ConstantDataArray *CDA =
       dyn_cast<ConstantDataArray>(pImpl->getAttributeKind())) {
     std::string Result;
     Result += '\"' + CDA->getAsString().str() + '"';
 
-    ArrayRef<Constant*> Vals = pImpl->getAttributeValues();
-    if (Vals.empty()) return Result;
+    Constant *Vals = pImpl->getAttributeValues();
+    if (!Vals) return Result;
+
+    // FIXME: This should support more than just ConstantDataArrays. Also,
+    // support a vector of attribute values.
+
     Result += " = ";
-    if (Vals.size() > 1) Result += '(';
-    for (ArrayRef<Constant*>::iterator I = Vals.begin(), E = Vals.end();
-         I != E; ) {
-      ConstantDataArray *CDA = cast<ConstantDataArray>(*I++);
-      Result += '\"' + CDA->getAsString().str() + '"';
-      if (I != E) Result += ' ';
-    }
-    if (Vals.size() > 1) Result += ')';
+    Result += '\"' + cast<ConstantDataArray>(Vals)->getAsString().str() + '"';
+
     return Result;
   }
 
@@ -237,13 +235,13 @@
 uint64_t AttributeImpl::getAlignment() const {
   assert(hasAttribute(Attribute::Alignment) &&
          "Trying to retrieve the alignment from a non-alignment attr!");
-  return cast<ConstantInt>(Vals[0])->getZExtValue();
+  return cast<ConstantInt>(Values)->getZExtValue();
 }
 
 uint64_t AttributeImpl::getStackAlignment() const {
   assert(hasAttribute(Attribute::StackAlignment) &&
          "Trying to retrieve the stack alignment from a non-alignment attr!");
-  return cast<ConstantInt>(Vals[0])->getZExtValue();
+  return cast<ConstantInt>(Values)->getZExtValue();
 }
 
 bool AttributeImpl::operator==(Attribute::AttrKind kind) const {