8 files changed, 40 insertions, 6 deletions
diff --git a/llvm/test/Transforms/AddReadAttrs/2008-09-03-Mutual.ll b/llvm/test/Transforms/FunctionAttrs/2008-09-03-Mutual.ll
index 0a4f0855ca4..5261ac46588 100644
--- a/llvm/test/Transforms/AddReadAttrs/2008-09-03-Mutual.ll
+++ b/llvm/test/Transforms/FunctionAttrs/2008-09-03-Mutual.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -addreadattrs | llvm-dis | grep readnone
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | grep readnone
 
 define i32 @a() {
 	%tmp = call i32 @b( )		; <i32> [#uses=1]
diff --git a/llvm/test/Transforms/AddReadAttrs/2008-09-03-ReadNone.ll b/llvm/test/Transforms/FunctionAttrs/2008-09-03-ReadNone.ll
index 3c7b32d9d49..a17d381eec8 100644
--- a/llvm/test/Transforms/AddReadAttrs/2008-09-03-ReadNone.ll
+++ b/llvm/test/Transforms/FunctionAttrs/2008-09-03-ReadNone.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -addreadattrs | llvm-dis | grep readnone | count 4
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | grep readnone | count 4
 @x = global i32 0
 
 declare i32 @e() readnone
diff --git a/llvm/test/Transforms/AddReadAttrs/2008-09-03-ReadOnly.ll b/llvm/test/Transforms/FunctionAttrs/2008-09-03-ReadOnly.ll
index c08e7b12653..cebfdacb4c0 100644
--- a/llvm/test/Transforms/AddReadAttrs/2008-09-03-ReadOnly.ll
+++ b/llvm/test/Transforms/FunctionAttrs/2008-09-03-ReadOnly.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -addreadattrs | llvm-dis | grep readonly | count 2
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | grep readonly | count 2
 
 define i32 @f() {
 entry:
diff --git a/llvm/test/Transforms/AddReadAttrs/2008-09-13-VolatileRead.ll b/llvm/test/Transforms/FunctionAttrs/2008-09-13-VolatileRead.ll
index 0690083ae78..b6077fd8ee3 100644
--- a/llvm/test/Transforms/AddReadAttrs/2008-09-13-VolatileRead.ll
+++ b/llvm/test/Transforms/FunctionAttrs/2008-09-13-VolatileRead.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -addreadattrs | llvm-dis | not grep read
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | not grep read
 ; PR2792
 
 @g = global i32 0		; <i32*> [#uses=1]
diff --git a/llvm/test/Transforms/AddReadAttrs/2008-10-04-LocalMemory.ll b/llvm/test/Transforms/FunctionAttrs/2008-10-04-LocalMemory.ll
index 0f63c1a58be..50ca6412000 100644
--- a/llvm/test/Transforms/AddReadAttrs/2008-10-04-LocalMemory.ll
+++ b/llvm/test/Transforms/FunctionAttrs/2008-10-04-LocalMemory.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -addreadattrs | llvm-dis | grep readnone | count 2
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | grep readnone | count 2
 
 declare i32 @g(i32*) readnone
 
diff --git a/llvm/test/Transforms/AddReadAttrs/2008-12-29-Constant.ll b/llvm/test/Transforms/FunctionAttrs/2008-12-29-Constant.ll
index fe038c1be9a..d9c01171ac4 100644
--- a/llvm/test/Transforms/AddReadAttrs/2008-12-29-Constant.ll
+++ b/llvm/test/Transforms/FunctionAttrs/2008-12-29-Constant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -addreadattrs | llvm-dis | grep readnone
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | grep readnone
 
 @s = external constant i8		; <i8*> [#uses=1]
 
diff --git a/llvm/test/Transforms/FunctionAttrs/2008-12-31-NoCapture.ll b/llvm/test/Transforms/FunctionAttrs/2008-12-31-NoCapture.ll
new file mode 100644
index 00000000000..6d2ca1e446f
--- /dev/null
+++ b/llvm/test/Transforms/FunctionAttrs/2008-12-31-NoCapture.ll
@@ -0,0 +1,34 @@
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | not grep {@c.*nocapture}
+; RUN: llvm-as < %s | opt -functionattrs | llvm-dis | grep nocapture | count 3
+@g = global i32* null		; <i32**> [#uses=1]
+
+define i32* @c1(i32* %p) {
+	ret i32* %p
+}
+
+define void @c2(i32* %p) {
+	store i32* %p, i32** @g
+	ret void
+}
+
+define void @c3(i32* %p) {
+	call void @c2(i32* %p)
+	ret void
+}
+
+define i32 @nc1(i32* %p) {
+	%tmp = bitcast i32* %p to i32*		; <i32*> [#uses=2]
+	%val = load i32* %tmp		; <i32> [#uses=1]
+	store i32 0, i32* %tmp
+	ret i32 %val
+}
+
+define void @nc2(i32* %p) {
+	%1 = call i32 @nc1(i32* %p)		; <i32> [#uses=0]
+	ret void
+}
+
+define void @nc3(void ()* %f) {
+	call void %f()
+	ret void
+}
diff --git a/llvm/test/Transforms/AddReadAttrs/dg.exp b/llvm/test/Transforms/FunctionAttrs/dg.exp
index f2005891a59..f2005891a59 100644
--- a/llvm/test/Transforms/AddReadAttrs/dg.exp
+++ b/llvm/test/Transforms/FunctionAttrs/dg.exp