Convert getAttributes() to return an AttributeSetNode.

The AttributeSetNode contains all of the attributes. This removes one (hopefully
last) use of the Attribute class as a container of multiple attributes.


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

2 files changed, 12 insertions, 12 deletions

diff --git a/test/Transforms/FunctionAttrs/atomic.ll b/test/Transforms/FunctionAttrs/atomic.ll
index 7c2bff7..df916e2 100644
--- a/test/Transforms/FunctionAttrs/atomic.ll
+++ b/test/Transforms/FunctionAttrs/atomic.ll
@@ -3,7 +3,7 @@
 ; Atomic load/store to local doesn't affect whether a function is
 ; readnone/readonly.
 define i32 @test1(i32 %x) uwtable ssp {
-; CHECK: define i32 @test1(i32 %x) uwtable readnone ssp {
+; CHECK: define i32 @test1(i32 %x) readnone ssp uwtable {
 entry:
   %x.addr = alloca i32, align 4
   store atomic i32 %x, i32* %x.addr seq_cst, align 4
@@ -13,7 +13,7 @@ entry:
 
 ; A function with an Acquire load is not readonly.
 define i32 @test2(i32* %x) uwtable ssp {
-; CHECK: define i32 @test2(i32* nocapture %x) uwtable ssp {
+; CHECK: define i32 @test2(i32* nocapture %x) ssp uwtable {
 entry:
   %r = load atomic i32* %x seq_cst, align 4
   ret i32 %r
diff --git a/test/Transforms/Inline/inline_ssp.ll b/test/Transforms/Inline/inline_ssp.ll
index d9996b3..ff0d5ce 100644
--- a/test/Transforms/Inline/inline_ssp.ll
+++ b/test/Transforms/Inline/inline_ssp.ll
@@ -39,35 +39,35 @@ entry:
 
 define void @inline_req_req() nounwind uwtable sspreq {
 entry:
-; CHECK: @inline_req_req() nounwind uwtable sspreq 
+; CHECK: @inline_req_req() nounwind sspreq uwtable 
   call void @fun_sspreq()
   ret void
 }
 
 define void @inline_req_strong() nounwind uwtable sspstrong {
 entry:
-; CHECK: @inline_req_strong() nounwind uwtable sspreq 
+; CHECK: @inline_req_strong() nounwind sspreq uwtable 
   call void @fun_sspreq()
   ret void
 }
 
 define void @inline_req_ssp() nounwind uwtable ssp {
 entry:
-; CHECK: @inline_req_ssp() nounwind uwtable sspreq 
+; CHECK: @inline_req_ssp() nounwind sspreq uwtable 
   call void @fun_sspreq()
   ret void
 }
 
 define void @inline_req_nossp() nounwind uwtable {
 entry:
-; CHECK: @inline_req_nossp() nounwind uwtable sspreq 
+; CHECK: @inline_req_nossp() nounwind sspreq uwtable 
   call void @fun_sspreq()
   ret void
 }
 
 define void @inline_strong_req() nounwind uwtable sspreq {
 entry:
-; CHECK: @inline_strong_req() nounwind uwtable sspreq 
+; CHECK: @inline_strong_req() nounwind sspreq uwtable 
   call void @fun_sspstrong()
   ret void
 }
@@ -96,7 +96,7 @@ entry:
 
 define void @inline_ssp_req() nounwind uwtable sspreq {
 entry:
-; CHECK: @inline_ssp_req() nounwind uwtable sspreq
+; CHECK: @inline_ssp_req() nounwind sspreq uwtable
   call void @fun_ssp()
   ret void
 }
@@ -111,21 +111,21 @@ entry:
 
 define void @inline_ssp_ssp() nounwind uwtable ssp {
 entry:
-; CHECK: @inline_ssp_ssp() nounwind uwtable ssp
+; CHECK: @inline_ssp_ssp() nounwind ssp uwtable
   call void @fun_ssp()
   ret void
 }
 
 define void @inline_ssp_nossp() nounwind uwtable {
 entry:
-; CHECK: @inline_ssp_nossp() nounwind uwtable ssp
+; CHECK: @inline_ssp_nossp() nounwind ssp uwtable
   call void @fun_ssp()
   ret void
 }
 
 define void @inline_nossp_req() nounwind uwtable sspreq {
 entry:
-; CHECK: @inline_nossp_req() nounwind uwtable sspreq
+; CHECK: @inline_nossp_req() nounwind sspreq uwtable
   call void @fun_nossp()
   ret void
 }
@@ -140,7 +140,7 @@ entry:
 
 define void @inline_nossp_ssp() nounwind uwtable ssp {
 entry:
-; CHECK: @inline_nossp_ssp() nounwind uwtable ssp
+; CHECK: @inline_nossp_ssp() nounwind ssp uwtable
   call void @fun_nossp()
   ret void
 }