Add the integer value of the ConstantInt instead of the Constant* value.

This is causing some problems. The root cause is unknown at this time.

llvm-svn: 171923

2 files changed, 9 insertions, 6 deletions

diff --git a/llvm/lib/IR/AttributeImpl.h b/llvm/lib/IR/AttributeImpl.h
index 7bb666a40a1..1164d688bf2 100644
--- a/llvm/lib/IR/AttributeImpl.h
+++ b/llvm/lib/IR/AttributeImpl.h
@@ -65,12 +65,7 @@ public:
     Profile(ID, Data, Vals);
   }
   static void Profile(FoldingSetNodeID &ID, Constant *Data,
-                      ArrayRef<Constant*> Vals) {
-    ID.AddPointer(Data);
-    for (ArrayRef<Constant*>::iterator I = Vals.begin(), E = Vals.end();
-         I != E; ++I)
-      ID.AddPointer(*I);
-  }
+                      ArrayRef<Constant*> Vals);
 };
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/IR/Attributes.cpp b/llvm/lib/IR/Attributes.cpp
index bef7a6c1749..01a59a33c0f 100644
--- a/llvm/lib/IR/Attributes.cpp
+++ b/llvm/lib/IR/Attributes.cpp
@@ -509,6 +509,14 @@ void AttributeImpl::setStackAlignment(unsigned Align) {
   Vals.push_back(ConstantInt::get(Type::getInt64Ty(Context), Align));
 }
 
+void Profile(FoldingSetNodeID &ID, Constant *Data,
+             ArrayRef<Constant*> Vals) {
+  ID.AddInteger(cast<ConstantInt>(Data)->getZExtValue());
+  for (ArrayRef<Constant*>::iterator I = Vals.begin(), E = Vals.end();
+       I != E; ++I)
+    ID.AddPointer(*I);
+}
+
 //===----------------------------------------------------------------------===//
 // AttributeSetImpl Definition
 //===----------------------------------------------------------------------===//