r176009 - Add more attributes from the command line to functions.
Anna Zaks
ganna at apple.com
Mon Feb 25 09:45:06 PST 2013
Bill,
Two Release+Asserts builds had started failing after this commit - a private builder and the following public one. Both are timing out during make.
http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-RA
Cheers,
Anna.
On Feb 24, 2013, at 11:15 PM, Bill Wendling <isanbard at gmail.com> wrote:
> Author: void
> Date: Mon Feb 25 01:15:16 2013
> New Revision: 176009
>
> URL: http://llvm.org/viewvc/llvm-project?rev=176009&view=rev
> Log:
> Add more attributes from the command line to functions.
>
> This is an ongoing process. Any command line option which a back-end cares about
> should be added here.
>
> Modified:
> cfe/trunk/lib/CodeGen/CGCall.cpp
> cfe/trunk/test/CodeGen/2008-04-08-NoExceptions.c
> cfe/trunk/test/CodeGen/address-space-field1.c
> cfe/trunk/test/CodeGen/alias.c
> cfe/trunk/test/CodeGen/attr-naked.c
> cfe/trunk/test/CodeGen/attributes.c
> cfe/trunk/test/CodeGen/builtin-attributes.c
> cfe/trunk/test/CodeGen/function-attributes.c
> cfe/trunk/test/CodeGen/incomplete-function-type-2.c
> cfe/trunk/test/CodeGen/libcall-declarations.c
> cfe/trunk/test/CodeGen/libcalls.c
> cfe/trunk/test/CodeGen/mips-vector-arg.c
> cfe/trunk/test/CodeGen/mrtd.c
> cfe/trunk/test/CodeGen/ms-declspecs.c
> cfe/trunk/test/CodeGen/ppc64-complex-parms.c
> cfe/trunk/test/CodeGen/ppc64-complex-return.c
> cfe/trunk/test/CodeGen/ppc64-extend.c
> cfe/trunk/test/CodeGen/pragma-weak.c
> cfe/trunk/test/CodeGen/struct-passing.c
> cfe/trunk/test/CodeGen/unwind-attr.c
> cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp
> cfe/trunk/test/CodeGenCXX/attr.cpp
> cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp
> cfe/trunk/test/CodeGenCXX/default-destructor-synthesis.cpp
> cfe/trunk/test/CodeGenCXX/derived-to-base.cpp
> cfe/trunk/test/CodeGenCXX/exceptions.cpp
> cfe/trunk/test/CodeGenCXX/global-dtor-no-atexit.cpp
> cfe/trunk/test/CodeGenCXX/global-init.cpp
> cfe/trunk/test/CodeGenCXX/member-initializers.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp
> cfe/trunk/test/CodeGenCXX/no-exceptions.cpp
> cfe/trunk/test/CodeGenCXX/pointers-to-data-members.cpp
> cfe/trunk/test/CodeGenCXX/reference-cast.cpp
> cfe/trunk/test/CodeGenCXX/threadsafe-statics.cpp
> cfe/trunk/test/CodeGenCXX/thunks.cpp
> cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp
> cfe/trunk/test/CodeGenObjC/arc.m
> cfe/trunk/test/CodeGenObjC/gnu-exceptions.m
> cfe/trunk/test/CodeGenObjC/nonlazy-msgSend.m
> cfe/trunk/test/CodeGenObjC/objc-literal-debugger-test.m
> cfe/trunk/test/CodeGenObjC/objc-literal-tests.m
> cfe/trunk/test/CodeGenObjCXX/lambda-expressions.mm
> cfe/trunk/test/Driver/darwin-iphone-defaults.m
>
> Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGCall.cpp Mon Feb 25 01:15:16 2013
> @@ -23,6 +23,7 @@
> #include "clang/AST/DeclObjC.h"
> #include "clang/Basic/TargetInfo.h"
> #include "clang/Frontend/CodeGenOptions.h"
> +#include "llvm/ADT/StringExtras.h"
> #include "llvm/IR/Attributes.h"
> #include "llvm/IR/DataLayout.h"
> #include "llvm/IR/InlineAsm.h"
> @@ -1023,9 +1024,66 @@ void CodeGenModule::ConstructAttributeLi
> FuncAttrs.addAttribute(llvm::Attribute::NoBuiltin);
> } else {
> // Attributes that should go on the function, but not the call site.
> + if (!CodeGenOpts.CodeModel.empty())
> + FuncAttrs.addAttribute("code-model", CodeGenOpts.CodeModel);
> + if (!CodeGenOpts.RelocationModel.empty())
> + FuncAttrs.addAttribute("relocation-model", CodeGenOpts.RelocationModel);
> +
> + if (CodeGenOpts.FloatABI == "soft" || CodeGenOpts.FloatABI == "softfp")
> + FuncAttrs.addAttribute("float-abi", "soft");
> + else if (CodeGenOpts.FloatABI == "hard")
> + FuncAttrs.addAttribute("float-abi", "hard");
> +
> + if (!CodeGenOpts.DisableFPElim) {
> + /* ignore */ ;
> + } else if (CodeGenOpts.OmitLeafFramePointer) {
> + FuncAttrs.addAttribute("no-frame-pointer-elim-non-leaf");
> + } else {
> + FuncAttrs.addAttribute("no-frame-pointer-elim");
> + FuncAttrs.addAttribute("no-frame-pointer-elim-non-leaf");
> + }
> +
> + switch (CodeGenOpts.getFPContractMode()) {
> + case CodeGenOptions::FPC_Off:
> + FuncAttrs.addAttribute("fp-contract-model", "strict");
> + break;
> + case CodeGenOptions::FPC_On:
> + FuncAttrs.addAttribute("fp-contract-model", "standard");
> + break;
> + case CodeGenOptions::FPC_Fast:
> + FuncAttrs.addAttribute("fp-contract-model", "fast");
> + break;
> + }
> +
> + if (CodeGenOpts.LessPreciseFPMAD)
> + FuncAttrs.addAttribute("less-precise-fpmad");
> + if (CodeGenOpts.NoInfsFPMath)
> + FuncAttrs.addAttribute("no-infs-fp-math");
> + if (CodeGenOpts.NoNaNsFPMath)
> + FuncAttrs.addAttribute("no-nans-fp-math");
> + if (CodeGenOpts.NoZeroInitializedInBSS)
> + FuncAttrs.addAttribute("no-zero-init-in-bss");
> + if (CodeGenOpts.UnsafeFPMath)
> + FuncAttrs.addAttribute("unsafe-fp-math");
> + if (CodeGenOpts.SoftFloat)
> + FuncAttrs.addAttribute("use-soft-float");
> + if (CodeGenOpts.StackAlignment)
> + FuncAttrs.addAttribute("stack-align-override",
> + llvm::utostr(CodeGenOpts.StackAlignment));
> + if (CodeGenOpts.StackRealignment)
> + FuncAttrs.addAttribute("realign-stack");
> + if (CodeGenOpts.DisableTailCalls)
> + FuncAttrs.addAttribute("disable-tail-calls");
> + if (!CodeGenOpts.TrapFuncName.empty())
> + FuncAttrs.addAttribute("trap-func-name", CodeGenOpts.TrapFuncName);
> + if (LangOpts.PIELevel != 0)
> + FuncAttrs.addAttribute("pie");
> + if (CodeGenOpts.SSPBufferSize)
> + FuncAttrs.addAttribute("ssp-buffers-size",
> + llvm::utostr(CodeGenOpts.SSPBufferSize));
> +
> if (!TargetOpts.CPU.empty())
> FuncAttrs.addAttribute("target-cpu", TargetOpts.CPU);
> -
> if (TargetOpts.Features.size()) {
> llvm::SubtargetFeatures Features;
> for (std::vector<std::string>::const_iterator
>
> Modified: cfe/trunk/test/CodeGen/2008-04-08-NoExceptions.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/2008-04-08-NoExceptions.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/2008-04-08-NoExceptions.c (original)
> +++ cfe/trunk/test/CodeGen/2008-04-08-NoExceptions.c Mon Feb 25 01:15:16 2013
> @@ -2,12 +2,11 @@
>
> void f(void);
> void g(void) {
> - // CHECK: define void @g() #0
> + // CHECK: define void @g() [[NUW:#[0-9]+]]
> // CHECK-NOT: call void @f() nounwind
> f();
> }
>
> -// CHECK-NOT: declare void @f() #0
> +// CHECK-NOT: declare void @f() [[NUW]]
>
> -// CHECK: attributes #0 = { nounwind {{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/address-space-field1.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/address-space-field1.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/address-space-field1.c (original)
> +++ cfe/trunk/test/CodeGen/address-space-field1.c Mon Feb 25 01:15:16 2013
> @@ -1,6 +1,6 @@
> // RUN: %clang_cc1 -emit-llvm -triple x86_64-apple-darwin10 < %s -o - | FileCheck %s
> // CHECK:%struct.S = type { i32, i32 }
> -// CHECK:define void @test_addrspace(%struct.S addrspace(1)* %p1, %struct.S addrspace(2)* %p2) #0
> +// CHECK:define void @test_addrspace(%struct.S addrspace(1)* %p1, %struct.S addrspace(2)* %p2) [[NUW:#[0-9]+]]
> // CHECK: [[p1addr:%.*]] = alloca %struct.S addrspace(1)*
> // CHECK: [[p2addr:%.*]] = alloca %struct.S addrspace(2)*
> // CHECK: store %struct.S addrspace(1)* %p1, %struct.S addrspace(1)** [[p1addr]]
> @@ -37,4 +37,4 @@ void test_addrspace(__addr1 S* p1, __add
> p1->b = p2->a;
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/alias.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/alias.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/alias.c (original)
> +++ cfe/trunk/test/CodeGen/alias.c Mon Feb 25 01:15:16 2013
> @@ -14,7 +14,7 @@ void f0(void) { }
> extern void f1(void);
> extern void f1(void) __attribute((alias("f0")));
> // CHECKBASIC: @f1 = alias void ()* @f0
> -// CHECKBASIC: define void @f0() #0 {
> +// CHECKBASIC: define void @f0() [[NUW:#[0-9]+]] {
>
> // Make sure that aliases cause referenced values to be emitted.
> // PR3200
> @@ -34,19 +34,17 @@ static int inner_weak(int a) { return 0;
> extern __typeof(inner) inner_a __attribute__((alias("inner")));
> static __typeof(inner_weak) inner_weak_a __attribute__((weakref, alias("inner_weak")));
> // CHECKCC: @inner_a = alias i32 (i32)* @inner
> -// CHECKCC: define internal arm_aapcs_vfpcc i32 @inner(i32 %a) #0 {
> +// CHECKCC: define internal arm_aapcs_vfpcc i32 @inner(i32 %a) [[NUW:#[0-9]+]] {
>
> int outer(int a) { return inner(a); }
> -// CHECKCC: define arm_aapcs_vfpcc i32 @outer(i32 %a) #0 {
> +// CHECKCC: define arm_aapcs_vfpcc i32 @outer(i32 %a) [[NUW]] {
> // CHECKCC: call arm_aapcs_vfpcc i32 @inner(i32 %{{.*}})
>
> int outer_weak(int a) { return inner_weak_a(a); }
> -// CHECKCC: define arm_aapcs_vfpcc i32 @outer_weak(i32 %a) #0 {
> +// CHECKCC: define arm_aapcs_vfpcc i32 @outer_weak(i32 %a) [[NUW]] {
> // CHECKCC: call arm_aapcs_vfpcc i32 @inner_weak(i32 %{{.*}})
> -// CHECKCC: define internal arm_aapcs_vfpcc i32 @inner_weak(i32 %a) #0 {
> +// CHECKCC: define internal arm_aapcs_vfpcc i32 @inner_weak(i32 %a) [[NUW]] {
>
> -// CHECKBASIC: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECKBASIC: attributes #1 = { inlinehint nounwind "target-features"={{.*}} }
> +// CHECKBASIC: attributes [[NUW]] = { nounwind{{.*}} }
>
> -// CHECKCC: attributes #0 = { nounwind }
> -// CHECKCC: attributes #1 = { inlinehint nounwind }
> +// CHECKCC: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/attr-naked.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/attr-naked.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/attr-naked.c (original)
> +++ cfe/trunk/test/CodeGen/attr-naked.c Mon Feb 25 01:15:16 2013
> @@ -4,15 +4,15 @@ void t1() __attribute__((naked));
>
> // Basic functionality check
> // (Note that naked needs to imply noinline to work properly.)
> -// CHECK: define void @t1() #0 {
> +// CHECK: define void @t1() [[NAKED:#[0-9]+]] {
> void t1()
> {
> }
>
> // Make sure this doesn't explode in the verifier.
> // (It doesn't really make sense, but it isn't invalid.)
> -// CHECK: define void @t2() #0 {
> +// CHECK: define void @t2() [[NAKED]] {
> __attribute((naked, always_inline)) void t2() {
> }
>
> -// CHECK: attributes #0 = { naked noinline nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NAKED]] = { naked noinline nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/attributes.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/attributes.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/attributes.c (original)
> +++ cfe/trunk/test/CodeGen/attributes.c Mon Feb 25 01:15:16 2013
> @@ -36,39 +36,39 @@ int t17() {
> return t15() + t16;
> }
>
> -// CHECK: define void @t1() #2 {
> +// CHECK: define void @t1() [[NR:#[0-9]+]] {
> void t1() __attribute__((noreturn));
> void t1() { while (1) {} }
>
> -// CHECK: define void @t2() #0 {
> +// CHECK: define void @t2() [[NUW:#[0-9]+]] {
> void t2() __attribute__((nothrow));
> void t2() {}
>
> -// CHECK: define weak void @t3() #0 {
> +// CHECK: define weak void @t3() [[NUW]] {
> void t3() __attribute__((weak));
> void t3() {}
>
> -// CHECK: define hidden void @t4() #0 {
> +// CHECK: define hidden void @t4() [[NUW]] {
> void t4() __attribute__((visibility("hidden")));
> void t4() {}
>
> -// CHECK: define void @t7() #2 {
> +// CHECK: define void @t7() [[NR]] {
> void t7() __attribute__((noreturn, nothrow));
> void t7() { while (1) {} }
>
> -// CHECK: define void @t10() #0 section "SECT" {
> +// CHECK: define void @t10() [[NUW]] section "SECT" {
> void t10(void) __attribute__((section("SECT")));
> void t10(void) {}
> -// CHECK: define void @t11() #0 section "SECT" {
> +// CHECK: define void @t11() [[NUW]] section "SECT" {
> void __attribute__((section("SECT"))) t11(void) {}
>
> -// CHECK: define i32 @t19() #0 {
> +// CHECK: define i32 @t19() [[NUW]] {
> extern int t19(void) __attribute__((weak_import));
> int t19(void) {
> return 10;
> }
>
> -// CHECK:define void @t20() #0 {
> +// CHECK:define void @t20() [[NUW]] {
> // CHECK: call void @abort()
> // CHECK-NEXT: unreachable
> void t20(void) {
> @@ -88,8 +88,7 @@ void t21(void) {
> void __attribute__((section(".foo"))) t22(void);
> void __attribute__((section(".bar"))) t22(void) {}
>
> -// CHECK: define void @t22() #0 section ".bar"
> +// CHECK: define void @t22() [[NUW]] section ".bar"
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> -// CHECK: attributes #2 = { noreturn nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
> +// CHECK: attributes [[NR]] = { noreturn nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/builtin-attributes.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/builtin-attributes.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/builtin-attributes.c (original)
> +++ cfe/trunk/test/CodeGen/builtin-attributes.c Mon Feb 25 01:15:16 2013
> @@ -58,5 +58,4 @@ int f3(double x) {
> return e;
> }
>
> -// CHECK: attributes [[NUW]] = { nounwind }
> -// CHECK: attributes #1 = { noreturn }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/function-attributes.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/function-attributes.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/function-attributes.c (original)
> +++ cfe/trunk/test/CodeGen/function-attributes.c Mon Feb 25 01:15:16 2013
> @@ -1,12 +1,12 @@
> // RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -Os -o - %s | FileCheck %s
> -// CHECK: define signext i8 @f0(i32 %x) #0
> -// CHECK: define zeroext i8 @f1(i32 %x) #0
> -// CHECK: define void @f2(i8 signext %x) #0
> -// CHECK: define void @f3(i8 zeroext %x) #0
> -// CHECK: define signext i16 @f4(i32 %x) #0
> -// CHECK: define zeroext i16 @f5(i32 %x) #0
> -// CHECK: define void @f6(i16 signext %x) #0
> -// CHECK: define void @f7(i16 zeroext %x) #0
> +// CHECK: define signext i8 @f0(i32 %x) [[NUW:#[0-9]+]]
> +// CHECK: define zeroext i8 @f1(i32 %x) [[NUW]]
> +// CHECK: define void @f2(i8 signext %x) [[NUW]]
> +// CHECK: define void @f3(i8 zeroext %x) [[NUW]]
> +// CHECK: define signext i16 @f4(i32 %x) [[NUW]]
> +// CHECK: define zeroext i16 @f5(i32 %x) [[NUW]]
> +// CHECK: define void @f6(i16 signext %x) [[NUW]]
> +// CHECK: define void @f7(i16 zeroext %x) [[NUW]]
>
> signed char f0(int x) { return x; }
>
> @@ -25,25 +25,25 @@ void f6(signed short x) { }
> void f7(unsigned short x) { }
>
> // CHECK: define void @f8()
> -// CHECK: #1
> +// CHECK: [[AI:#[0-9]+]]
> // CHECK: {
> void __attribute__((always_inline)) f8(void) { }
>
> // CHECK: call void @f9_t()
> -// CHECK: [[F9:#[0-9]+]]
> +// CHECK: [[NR:#[0-9]+]]
> // CHECK: }
> void __attribute__((noreturn)) f9_t(void);
> void f9(void) { f9_t(); }
>
> // CHECK: call void @f9a()
> -// CHECK: [[F9]]
> +// CHECK: [[NR]]
> // CHECK: }
> _Noreturn void f9a(void);
> void f9b(void) { f9a(); }
>
> // FIXME: We should be setting nounwind on calls.
> // CHECK: call i32 @f10_t()
> -// CHECK: [[F10_T:#[0-9]+]]
> +// CHECK: [[NUW_RN:#[0-9]+]]
> // CHECK: {
> int __attribute__((const)) f10_t(void);
> int f10(void) { return f10_t(); }
> @@ -55,7 +55,7 @@ int f12(int arg) {
> return arg ? 0 : f10_t();
> }
>
> -// CHECK: define void @f13() #0
> +// CHECK: define void @f13() [[NUW]]
> void f13(void) __attribute__((pure)) __attribute__((const));
> void f13(void){}
>
> @@ -82,24 +82,24 @@ void f14(int a) {
>
> // <rdar://problem/7102668> [irgen] clang isn't setting the optsize bit on functions
> // CHECK: define void @f15
> -// CHECK: #0
> +// CHECK: [[NUW]]
> // CHECK: {
> void f15(void) {
> }
>
> // PR5254
> // CHECK: define void @f16
> -// CHECK: #6
> +// CHECK: [[ALIGN:#[0-9]+]]
> // CHECK: {
> void __attribute__((force_align_arg_pointer)) f16(void) {
> }
>
> // PR11038
> // CHECK: define void @f18()
> -// CHECK: #7
> +// CHECK: [[RT:#[0-9]+]]
> // CHECK: {
> // CHECK: call void @f17()
> -// CHECK: [[F17:#[0-9]+]]
> +// CHECK: [[RT_CALL:#[0-9]+]]
> // CHECK: ret void
> __attribute__ ((returns_twice)) void f17(void);
> __attribute__ ((returns_twice)) void f18(void) {
> @@ -109,7 +109,7 @@ __attribute__ ((returns_twice)) void f18
> // CHECK: define void @f19()
> // CHECK: {
> // CHECK: call i32 @setjmp(i32* null)
> -// CHECK: [[F17]]
> +// CHECK: [[RT_CALL]]
> // CHECK: ret void
> typedef int jmp_buf[((9 * 2) + 3 + 16)];
> int setjmp(jmp_buf);
> @@ -117,15 +117,10 @@ void f19(void) {
> setjmp(0);
> }
>
> -// CHECK: attributes #0 = { nounwind optsize readnone "target-features"={{.*}} }
> -// CHECK: attributes #1 = { alwaysinline nounwind optsize readnone "target-features"={{.*}} }
> -// CHECK: attributes #2 = { noreturn nounwind optsize "target-features"={{.*}} }
> -// CHECK: attributes #3 = { noreturn optsize "target-features"={{.*}} }
> -// CHECK: attributes #4 = { nounwind optsize "target-features"={{.*}} }
> -// CHECK: attributes #5 = { optsize "target-features"={{.*}} }
> -// CHECK: attributes #6 = { nounwind optsize readnone alignstack=16 "target-features"={{.*}} }
> -// CHECK: attributes #7 = { nounwind optsize returns_twice "target-features"={{.*}} }
> -// CHECK: attributes #8 = { optsize returns_twice "target-features"={{.*}}
> -// CHECK: attributes [[F9]] = { noreturn nounwind optsize }
> -// CHECK: attributes [[F10_T]] = { nounwind optsize readnone }
> -// CHECK: attributes [[F17]] = { nounwind optsize returns_twice }
> +// CHECK: attributes [[NUW]] = { nounwind optsize readnone{{.*}} }
> +// CHECK: attributes [[AI]] = { alwaysinline nounwind optsize readnone{{.*}} }
> +// CHECK: attributes [[ALIGN]] = { nounwind optsize readnone alignstack=16{{.*}} }
> +// CHECK: attributes [[RT]] = { nounwind optsize returns_twice{{.*}} }
> +// CHECK: attributes [[NR]] = { noreturn nounwind optsize }
> +// CHECK: attributes [[NUW_RN]] = { nounwind optsize readnone }
> +// CHECK: attributes [[RT_CALL]] = { nounwind optsize returns_twice }
>
> Modified: cfe/trunk/test/CodeGen/incomplete-function-type-2.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/incomplete-function-type-2.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/incomplete-function-type-2.c (original)
> +++ cfe/trunk/test/CodeGen/incomplete-function-type-2.c Mon Feb 25 01:15:16 2013
> @@ -2,7 +2,7 @@
>
> // PR14355: don't crash
> // Keep this test in its own file because CodeGenTypes has global state.
> -// CHECK: define void @test10_foo({}* %p1.coerce) #0 {
> +// CHECK: define void @test10_foo({}* %p1.coerce) [[NUW:#[0-9]+]] {
> struct test10_B;
> typedef struct test10_B test10_F3(double);
> void test10_foo(test10_F3 p1);
> @@ -16,4 +16,4 @@ void test10_foo(test10_F3 p1)
> p1(0.0);
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/libcall-declarations.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/libcall-declarations.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/libcall-declarations.c (original)
> +++ cfe/trunk/test/CodeGen/libcall-declarations.c Mon Feb 25 01:15:16 2013
> @@ -86,111 +86,110 @@ void *use[] = {
> sqrtf, tan, tanl, tanf, trunc, truncl, truncf
> };
>
> -// CHECK-NOERRNO: declare double @acos(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @acosl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @acosf(float) #0
> -// CHECK-NOERRNO: declare double @asin(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @asinl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @asinf(float) #0
> -// CHECK-NOERRNO: declare double @atan(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @atanl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @atanf(float) #0
> -// CHECK-NOERRNO: declare double @atan2(double, double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) #0
> -// CHECK-NOERRNO: declare float @atan2f(float, float) #0
> -// CHECK-NOERRNO: declare double @ceil(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @ceill(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @ceilf(float) #0
> -// CHECK-NOERRNO: declare double @copysign(double, double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @copysignl(x86_fp80, x86_fp80) #0
> -// CHECK-NOERRNO: declare float @copysignf(float, float) #0
> -// CHECK-NOERRNO: declare double @cos(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @cosl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @cosf(float) #0
> -// CHECK-NOERRNO: declare double @exp(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @expl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @expf(float) #0
> -// CHECK-NOERRNO: declare double @exp2(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @exp2l(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @exp2f(float) #0
> -// CHECK-NOERRNO: declare double @fabs(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @fabsl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @fabsf(float) #0
> -// CHECK-NOERRNO: declare double @floor(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @floorl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @floorf(float) #0
> -// CHECK-NOERRNO: declare double @fma(double, double, double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @fmal(x86_fp80, x86_fp80, x86_fp80) #0
> -// CHECK-NOERRNO: declare float @fmaf(float, float, float) #0
> -// CHECK-NOERRNO: declare double @fmax(double, double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @fmaxl(x86_fp80, x86_fp80) #0
> -// CHECK-NOERRNO: declare float @fmaxf(float, float) #0
> -// CHECK-NOERRNO: declare double @fmin(double, double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @fminl(x86_fp80, x86_fp80) #0
> -// CHECK-NOERRNO: declare float @fminf(float, float) #0
> -// CHECK-NOERRNO: declare double @log(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @logl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @logf(float) #0
> -// CHECK-NOERRNO: declare double @log2(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @log2l(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @log2f(float) #0
> -// CHECK-NOERRNO: declare double @nearbyint(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @nearbyintl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @nearbyintf(float) #0
> -// CHECK-NOERRNO: declare double @pow(double, double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @powl(x86_fp80, x86_fp80) #0
> -// CHECK-NOERRNO: declare float @powf(float, float) #0
> -// CHECK-NOERRNO: declare double @rint(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @rintl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @rintf(float) #0
> -// CHECK-NOERRNO: declare double @round(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @roundl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @roundf(float) #0
> -// CHECK-NOERRNO: declare double @sin(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @sinl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @sinf(float) #0
> -// CHECK-NOERRNO: declare double @sqrt(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @sqrtl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @sqrtf(float) #0
> -// CHECK-NOERRNO: declare double @tan(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @tanl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @tanf(float) #0
> -// CHECK-NOERRNO: declare double @trunc(double) #0
> -// CHECK-NOERRNO: declare x86_fp80 @truncl(x86_fp80) #0
> -// CHECK-NOERRNO: declare float @truncf(float) #0
> +// CHECK-NOERRNO: declare double @acos(double) [[NUW:#[0-9]+]]
> +// CHECK-NOERRNO: declare x86_fp80 @acosl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @acosf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @asin(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @asinl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @asinf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @atan(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @atanl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @atanf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @atan2(double, double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @atan2f(float, float) [[NUW]]
> +// CHECK-NOERRNO: declare double @ceil(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @ceill(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @ceilf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @copysign(double, double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @copysignl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @copysignf(float, float) [[NUW]]
> +// CHECK-NOERRNO: declare double @cos(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @cosl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @cosf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @exp(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @expl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @expf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @exp2(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @exp2l(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @exp2f(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @fabs(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @fabsl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @fabsf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @floor(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @floorl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @floorf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @fma(double, double, double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @fmal(x86_fp80, x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @fmaf(float, float, float) [[NUW]]
> +// CHECK-NOERRNO: declare double @fmax(double, double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @fmaxl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @fmaxf(float, float) [[NUW]]
> +// CHECK-NOERRNO: declare double @fmin(double, double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @fminl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @fminf(float, float) [[NUW]]
> +// CHECK-NOERRNO: declare double @log(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @logl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @logf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @log2(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @log2l(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @log2f(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @nearbyint(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @nearbyintl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @nearbyintf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @pow(double, double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @powl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @powf(float, float) [[NUW]]
> +// CHECK-NOERRNO: declare double @rint(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @rintl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @rintf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @round(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @roundl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @roundf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @sin(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @sinl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @sinf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @sqrt(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @sqrtl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @sqrtf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @tan(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @tanl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @tanf(float) [[NUW]]
> +// CHECK-NOERRNO: declare double @trunc(double) [[NUW]]
> +// CHECK-NOERRNO: declare x86_fp80 @truncl(x86_fp80) [[NUW]]
> +// CHECK-NOERRNO: declare float @truncf(float) [[NUW]]
>
> -// CHECK-ERRNO: declare double @ceil(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @ceill(x86_fp80) #1
> -// CHECK-ERRNO: declare float @ceilf(float) #1
> -// CHECK-ERRNO: declare double @copysign(double, double) #1
> -// CHECK-ERRNO: declare x86_fp80 @copysignl(x86_fp80, x86_fp80) #1
> -// CHECK-ERRNO: declare float @copysignf(float, float) #1
> -// CHECK-ERRNO: declare double @fabs(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @fabsl(x86_fp80) #1
> -// CHECK-ERRNO: declare float @fabsf(float) #1
> -// CHECK-ERRNO: declare double @floor(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @floorl(x86_fp80) #1
> -// CHECK-ERRNO: declare float @floorf(float) #1
> -// CHECK-ERRNO: declare double @fmax(double, double) #1
> -// CHECK-ERRNO: declare x86_fp80 @fmaxl(x86_fp80, x86_fp80) #1
> -// CHECK-ERRNO: declare float @fmaxf(float, float) #1
> -// CHECK-ERRNO: declare double @fmin(double, double) #1
> -// CHECK-ERRNO: declare x86_fp80 @fminl(x86_fp80, x86_fp80) #1
> -// CHECK-ERRNO: declare float @fminf(float, float) #1
> -// CHECK-ERRNO: declare double @nearbyint(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @nearbyintl(x86_fp80) #1
> -// CHECK-ERRNO: declare float @nearbyintf(float) #1
> -// CHECK-ERRNO: declare double @rint(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @rintl(x86_fp80) #1
> -// CHECK-ERRNO: declare float @rintf(float) #1
> -// CHECK-ERRNO: declare double @round(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @roundl(x86_fp80) #1
> -// CHECK-ERRNO: declare float @roundf(float) #1
> -// CHECK-ERRNO: declare double @trunc(double) #1
> -// CHECK-ERRNO: declare x86_fp80 @truncl(x86_fp80) #1
> -// CHECK-ERRNO: declare float @truncf(float) #1
> +// CHECK-ERRNO: declare double @ceil(double) [[NUW:#[0-9]+]]
> +// CHECK-ERRNO: declare x86_fp80 @ceill(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @ceilf(float) [[NUW]]
> +// CHECK-ERRNO: declare double @copysign(double, double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @copysignl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @copysignf(float, float) [[NUW]]
> +// CHECK-ERRNO: declare double @fabs(double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @fabsl(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @fabsf(float) [[NUW]]
> +// CHECK-ERRNO: declare double @floor(double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @floorl(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @floorf(float) [[NUW]]
> +// CHECK-ERRNO: declare double @fmax(double, double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @fmaxl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @fmaxf(float, float) [[NUW]]
> +// CHECK-ERRNO: declare double @fmin(double, double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @fminl(x86_fp80, x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @fminf(float, float) [[NUW]]
> +// CHECK-ERRNO: declare double @nearbyint(double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @nearbyintl(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @nearbyintf(float) [[NUW]]
> +// CHECK-ERRNO: declare double @rint(double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @rintl(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @rintf(float) [[NUW]]
> +// CHECK-ERRNO: declare double @round(double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @roundl(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @roundf(float) [[NUW]]
> +// CHECK-ERRNO: declare double @trunc(double) [[NUW]]
> +// CHECK-ERRNO: declare x86_fp80 @truncl(x86_fp80) [[NUW]]
> +// CHECK-ERRNO: declare float @truncf(float) [[NUW]]
>
> -// CHECK-NOERRNO: attributes #0 = { nounwind readnone "target-features"={{.*}} }
> +// CHECK-NOERRNO: attributes [[NUW]] = { nounwind readnone{{.*}} }
>
> -// CHECK-ERRNO: attributes #0 = { "target-features"={{.*}} }
> -// CHECK-ERRNO: attributes #1 = { nounwind readnone "target-features"={{.*}} }
> +// CHECK-ERRNO: attributes [[NUW]] = { nounwind readnone{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/libcalls.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/libcalls.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/libcalls.c (original)
> +++ cfe/trunk/test/CodeGen/libcalls.c Mon Feb 25 01:15:16 2013
> @@ -24,9 +24,9 @@ void test_sqrt(float a0, double a1, long
> // CHECK-YES: declare float @sqrtf(float)
> // CHECK-YES: declare double @sqrt(double)
> // CHECK-YES: declare x86_fp80 @sqrtl(x86_fp80)
> -// CHECK-NO: declare float @sqrtf(float) #1
> -// CHECK-NO: declare double @sqrt(double) #1
> -// CHECK-NO: declare x86_fp80 @sqrtl(x86_fp80) #1
> +// CHECK-NO: declare float @sqrtf(float) [[NUW_RN1:#[0-9]+]]
> +// CHECK-NO: declare double @sqrt(double) [[NUW_RN1]]
> +// CHECK-NO: declare x86_fp80 @sqrtl(x86_fp80) [[NUW_RN1]]
>
> // CHECK-YES: define void @test_pow
> // CHECK-NO: define void @test_pow
> @@ -47,9 +47,9 @@ void test_pow(float a0, double a1, long
> // CHECK-YES: declare float @powf(float, float)
> // CHECK-YES: declare double @pow(double, double)
> // CHECK-YES: declare x86_fp80 @powl(x86_fp80, x86_fp80)
> -// CHECK-NO: declare float @llvm.pow.f32(float, float) #2
> -// CHECK-NO: declare double @llvm.pow.f64(double, double) #2
> -// CHECK-NO: declare x86_fp80 @llvm.pow.f80(x86_fp80, x86_fp80) #2
> +// CHECK-NO: declare float @llvm.pow.f32(float, float) [[NUW_RO:#[0-9]+]]
> +// CHECK-NO: declare double @llvm.pow.f64(double, double) [[NUW_RO]]
> +// CHECK-NO: declare x86_fp80 @llvm.pow.f80(x86_fp80, x86_fp80) [[NUW_RO]]
>
> // CHECK-YES: define void @test_fma
> // CHECK-NO: define void @test_fma
> @@ -67,12 +67,12 @@ void test_fma(float a0, double a1, long
> long double l2 = fmal(a2, a2, a2);
> }
>
> -// CHECK-YES: declare float @llvm.fma.f32(float, float, float) #2
> -// CHECK-YES: declare double @llvm.fma.f64(double, double, double) #2
> -// CHECK-YES: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) #2
> -// CHECK-NO: declare float @llvm.fma.f32(float, float, float) #3
> -// CHECK-NO: declare double @llvm.fma.f64(double, double, double) #3
> -// CHECK-NO: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) #3
> +// CHECK-YES: declare float @llvm.fma.f32(float, float, float) [[NUW_RN:#[0-9]+]]
> +// CHECK-YES: declare double @llvm.fma.f64(double, double, double) [[NUW_RN]]
> +// CHECK-YES: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) [[NUW_RN]]
> +// CHECK-NO: declare float @llvm.fma.f32(float, float, float) [[NUW_RN2:#[0-9]+]]
> +// CHECK-NO: declare double @llvm.fma.f64(double, double, double) [[NUW_RN2]]
> +// CHECK-NO: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) [[NUW_RN2]]
>
> // Just checking to make sure these library functions are marked readnone
> void test_builtins(double d, float f, long double ld) {
> @@ -81,49 +81,46 @@ void test_builtins(double d, float f, lo
> double atan_ = atan(d);
> long double atanl_ = atanl(ld);
> float atanf_ = atanf(f);
> -// CHECK-NO: declare double @atan(double) #1
> -// CHECK-NO: declare x86_fp80 @atanl(x86_fp80) #1
> -// CHECK-NO: declare float @atanf(float) #1
> -// CHECK-YES-NOT: declare double @atan(double) #2
> -// CHECK-YES-NOT: declare x86_fp80 @atanl(x86_fp80) #2
> -// CHECK-YES-NOT: declare float @atanf(float) #2
> +// CHECK-NO: declare double @atan(double) [[NUW_RN1]]
> +// CHECK-NO: declare x86_fp80 @atanl(x86_fp80) [[NUW_RN1]]
> +// CHECK-NO: declare float @atanf(float) [[NUW_RN1]]
> +// CHECK-YES-NOT: declare double @atan(double) [[NUW_RN]]
> +// CHECK-YES-NOT: declare x86_fp80 @atanl(x86_fp80) [[NUW_RN]]
> +// CHECK-YES-NOT: declare float @atanf(float) [[NUW_RN]]
>
> double atan2_ = atan2(d, 2);
> long double atan2l_ = atan2l(ld, ld);
> float atan2f_ = atan2f(f, f);
> -// CHECK-NO: declare double @atan2(double, double) #1
> -// CHECK-NO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) #1
> -// CHECK-NO: declare float @atan2f(float, float) #1
> -// CHECK-YES-NOT: declare double @atan2(double, double) #2
> -// CHECK-YES-NOT: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) #2
> -// CHECK-YES-NOT: declare float @atan2f(float, float) #2
> +// CHECK-NO: declare double @atan2(double, double) [[NUW_RN1]]
> +// CHECK-NO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) [[NUW_RN1]]
> +// CHECK-NO: declare float @atan2f(float, float) [[NUW_RN1]]
> +// CHECK-YES-NOT: declare double @atan2(double, double) [[NUW_RN]]
> +// CHECK-YES-NOT: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) [[NUW_RN]]
> +// CHECK-YES-NOT: declare float @atan2f(float, float) [[NUW_RN]]
>
> double exp_ = exp(d);
> long double expl_ = expl(ld);
> float expf_ = expf(f);
> -// CHECK-NO: declare double @exp(double) #1
> -// CHECK-NO: declare x86_fp80 @expl(x86_fp80) #1
> -// CHECK-NO: declare float @expf(float) #1
> -// CHECK-YES-NOT: declare double @exp(double) #2
> -// CHECK-YES-NOT: declare x86_fp80 @expl(x86_fp80) #2
> -// CHECK-YES-NOT: declare float @expf(float) #2
> +// CHECK-NO: declare double @exp(double) [[NUW_RN1]]
> +// CHECK-NO: declare x86_fp80 @expl(x86_fp80) [[NUW_RN1]]
> +// CHECK-NO: declare float @expf(float) [[NUW_RN1]]
> +// CHECK-YES-NOT: declare double @exp(double) [[NUW_RN]]
> +// CHECK-YES-NOT: declare x86_fp80 @expl(x86_fp80) [[NUW_RN]]
> +// CHECK-YES-NOT: declare float @expf(float) [[NUW_RN]]
>
> double log_ = log(d);
> long double logl_ = logl(ld);
> float logf_ = logf(f);
> -// CHECK-NO: declare double @log(double) #1
> -// CHECK-NO: declare x86_fp80 @logl(x86_fp80) #1
> -// CHECK-NO: declare float @logf(float) #1
> -// CHECK-YES-NOT: declare double @log(double) #2
> -// CHECK-YES-NOT: declare x86_fp80 @logl(x86_fp80) #2
> -// CHECK-YES-NOT: declare float @logf(float) #2
> +// CHECK-NO: declare double @log(double) [[NUW_RN1]]
> +// CHECK-NO: declare x86_fp80 @logl(x86_fp80) [[NUW_RN1]]
> +// CHECK-NO: declare float @logf(float) [[NUW_RN1]]
> +// CHECK-YES-NOT: declare double @log(double) [[NUW_RN]]
> +// CHECK-YES-NOT: declare x86_fp80 @logl(x86_fp80) [[NUW_RN]]
> +// CHECK-YES-NOT: declare float @logf(float) [[NUW_RN]]
> }
>
> -// CHECK-YES: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK-YES: attributes #1 = { "target-features"={{.*}} }
> -// CHECK-YES: attributes #2 = { nounwind readnone }
> -
> -// CHECK-NO: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK-NO: attributes #1 = { nounwind readnone "target-features"={{.*}} }
> -// CHECK-NO: attributes #2 = { nounwind readonly }
> -// CHECK-NO: attributes #3 = { nounwind readnone }
> +// CHECK-YES: attributes [[NUW_RN]] = { nounwind readnone }
> +
> +// CHECK-NO: attributes [[NUW_RN1]] = { nounwind readnone{{.*}} }
> +// CHECK-NO: attributes [[NUW_RO]] = { nounwind readonly }
> +// CHECK-NO: attributes [[NUW_RN2]] = { nounwind readnone }
>
> Modified: cfe/trunk/test/CodeGen/mips-vector-arg.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mips-vector-arg.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/mips-vector-arg.c (original)
> +++ cfe/trunk/test/CodeGen/mips-vector-arg.c Mon Feb 25 01:15:16 2013
> @@ -8,26 +8,26 @@
> typedef float v4sf __attribute__ ((__vector_size__ (16)));
> typedef int v4i32 __attribute__ ((__vector_size__ (16)));
>
> -// O32: define void @test_v4sf(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) #0
> +// O32: define void @test_v4sf(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) [[NUW1:#[0-9]+]]
> // O32: declare i32 @test_v4sf_2(i32, i32, i32, i32, i32, i32, i32, i32, i32, i32)
> -// N64: define void @test_v4sf(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) #0
> +// N64: define void @test_v4sf(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) [[NUW1:#[0-9]+]]
> // N64: declare i32 @test_v4sf_2(i64, i64, i32, i64, i64, i64)
> extern test_v4sf_2(v4sf, int, v4sf);
> void test_v4sf(v4sf a1, int a2, v4sf a3) {
> test_v4sf_2(a3, a2, a1);
> }
>
> -// O32: define void @test_v4i32(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) #0
> +// O32: define void @test_v4i32(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) [[NUW2:#[0-9]+]]
> // O32: declare i32 @test_v4i32_2(i32, i32, i32, i32, i32, i32, i32, i32, i32, i32)
> -// N64: define void @test_v4i32(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) #0
> +// N64: define void @test_v4i32(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) [[NUW2:#[0-9]+]]
> // N64: declare i32 @test_v4i32_2(i64, i64, i32, i64, i64, i64)
> extern test_v4i32_2(v4i32, int, v4i32);
> void test_v4i32(v4i32 a1, int a2, v4i32 a3) {
> test_v4i32_2(a3, a2, a1);
> }
>
> -// O32: attributes #0 = { nounwind "target-cpu"={{.*}} "target-features"={{.*}} }
> -// O32: attributes #1 = { "target-cpu"={{.*}} "target-features"={{.*}} }
> +// O32: attributes [[NUW1]] = { nounwind{{.*}} }
> +// O32: attributes [[NUW2]] = { nounwind{{.*}} }
>
> -// N64: attributes #0 = { nounwind "target-cpu"={{.*}} "target-features"={{.*}} }
> -// N64: attributes #1 = { "target-cpu"={{.*}} "target-features"={{.*}} }
> +// N64: attributes [[NUW1]] = { nounwind{{.*}} }
> +// N64: attributes [[NUW2]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/mrtd.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mrtd.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/mrtd.c (original)
> +++ cfe/trunk/test/CodeGen/mrtd.c Mon Feb 25 01:15:16 2013
> @@ -2,7 +2,7 @@
>
> void baz(int arg);
>
> -// CHECK: define x86_stdcallcc void @foo(i32 %arg) #0
> +// CHECK: define x86_stdcallcc void @foo(i32 %arg) [[NUW:#[0-9]+]]
> void foo(int arg) {
> // CHECK: call x86_stdcallcc i32 bitcast (i32 (...)* @bar to i32 (i32)*)(
> bar(arg);
> @@ -14,5 +14,4 @@ void foo(int arg) {
>
> // CHECK: declare x86_stdcallcc void @baz(i32)
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/ms-declspecs.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-declspecs.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/ms-declspecs.c (original)
> +++ cfe/trunk/test/CodeGen/ms-declspecs.c Mon Feb 25 01:15:16 2013
> @@ -8,21 +8,21 @@ union { struct S s; } u;
> // CHECK: @u = {{.*}}zeroinitializer, align 16
>
>
> -// CHECK: define void @t3() #0 {
> +// CHECK: define void @t3() [[NAKED:#[0-9]+]] {
> __declspec(naked) void t3() {}
>
> -// CHECK: define void @t22() #1
> +// CHECK: define void @t22() [[NUW:#[0-9]+]]
> void __declspec(nothrow) t22();
> void t22() {}
>
> -// CHECK: define void @t2() #2 {
> +// CHECK: define void @t2() [[NI:#[0-9]+]] {
> __declspec(noinline) void t2() {}
>
> // CHECK: call void @f20_t() [[NR:#[0-9]+]]
> __declspec(noreturn) void f20_t(void);
> void f20(void) { f20_t(); }
>
> -// CHECK: attributes #0 = { naked noinline nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #2 = { noinline nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NAKED]] = { naked noinline nounwind{{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
> +// CHECK: attributes [[NI]] = { noinline nounwind{{.*}} }
> // CHECK: attributes [[NR]] = { noreturn }
>
> Modified: cfe/trunk/test/CodeGen/ppc64-complex-parms.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ppc64-complex-parms.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/ppc64-complex-parms.c (original)
> +++ cfe/trunk/test/CodeGen/ppc64-complex-parms.c Mon Feb 25 01:15:16 2013
> @@ -9,55 +9,55 @@ float foo_float(_Complex float x) {
> return crealf(x);
> }
>
> -// CHECK: define float @foo_float(float {{[%A-Za-z0-9.]+}}, float {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define float @foo_float(float {{[%A-Za-z0-9.]+}}, float {{[%A-Za-z0-9.]+}}) [[NUW:#[0-9]+]] {
>
> double foo_double(_Complex double x) {
> return creal(x);
> }
>
> -// CHECK: define double @foo_double(double {{[%A-Za-z0-9.]+}}, double {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define double @foo_double(double {{[%A-Za-z0-9.]+}}, double {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> long double foo_long_double(_Complex long double x) {
> return creall(x);
> }
>
> -// CHECK: define ppc_fp128 @foo_long_double(ppc_fp128 {{[%A-Za-z0-9.]+}}, ppc_fp128 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define ppc_fp128 @foo_long_double(ppc_fp128 {{[%A-Za-z0-9.]+}}, ppc_fp128 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> int foo_int(_Complex int x) {
> return __real__ x;
> }
>
> -// CHECK: define signext i32 @foo_int(i32 {{[%A-Za-z0-9.]+}}, i32 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define signext i32 @foo_int(i32 {{[%A-Za-z0-9.]+}}, i32 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> short foo_short(_Complex short x) {
> return __real__ x;
> }
>
> -// CHECK: define signext i16 @foo_short(i16 {{[%A-Za-z0-9.]+}}, i16 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define signext i16 @foo_short(i16 {{[%A-Za-z0-9.]+}}, i16 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> signed char foo_char(_Complex signed char x) {
> return __real__ x;
> }
>
> -// CHECK: define signext i8 @foo_char(i8 {{[%A-Za-z0-9.]+}}, i8 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define signext i8 @foo_char(i8 {{[%A-Za-z0-9.]+}}, i8 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> long foo_long(_Complex long x) {
> return __real__ x;
> }
>
> -// CHECK: define i64 @foo_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define i64 @foo_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> long long foo_long_long(_Complex long long x) {
> return __real__ x;
> }
>
> -// CHECK: define i64 @foo_long_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define i64 @foo_long_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> void bar_float(void) {
> foo_float(2.0f - 2.5fi);
> }
>
> -// CHECK: define void @bar_float() #0 {
> +// CHECK: define void @bar_float() [[NUW]] {
> // CHECK: %[[VAR1:[A-Za-z0-9.]+]] = alloca { float, float }, align 4
> // CHECK: %[[VAR2:[A-Za-z0-9.]+]] = getelementptr inbounds { float, float }* %[[VAR1]], i32 0, i32 0
> // CHECK: %[[VAR3:[A-Za-z0-9.]+]] = getelementptr inbounds { float, float }* %[[VAR1]], i32 0, i32 1
> @@ -73,7 +73,7 @@ void bar_double(void) {
> foo_double(2.0 - 2.5i);
> }
>
> -// CHECK: define void @bar_double() #0 {
> +// CHECK: define void @bar_double() [[NUW]] {
> // CHECK: %[[VAR11:[A-Za-z0-9.]+]] = alloca { double, double }, align 8
> // CHECK: %[[VAR12:[A-Za-z0-9.]+]] = getelementptr inbounds { double, double }* %[[VAR11]], i32 0, i32 0
> // CHECK: %[[VAR13:[A-Za-z0-9.]+]] = getelementptr inbounds { double, double }* %[[VAR11]], i32 0, i32 1
> @@ -89,7 +89,7 @@ void bar_long_double(void) {
> foo_long_double(2.0L - 2.5Li);
> }
>
> -// CHECK: define void @bar_long_double() #0 {
> +// CHECK: define void @bar_long_double() [[NUW]] {
> // CHECK: %[[VAR21:[A-Za-z0-9.]+]] = alloca { ppc_fp128, ppc_fp128 }, align 16
> // CHECK: %[[VAR22:[A-Za-z0-9.]+]] = getelementptr inbounds { ppc_fp128, ppc_fp128 }* %[[VAR21]], i32 0, i32 0
> // CHECK: %[[VAR23:[A-Za-z0-9.]+]] = getelementptr inbounds { ppc_fp128, ppc_fp128 }* %[[VAR21]], i32 0, i32 1
> @@ -105,7 +105,7 @@ void bar_int(void) {
> foo_int(2 - 3i);
> }
>
> -// CHECK: define void @bar_int() #0 {
> +// CHECK: define void @bar_int() [[NUW]] {
> // CHECK: %[[VAR31:[A-Za-z0-9.]+]] = alloca { i32, i32 }, align 4
> // CHECK: %[[VAR32:[A-Za-z0-9.]+]] = getelementptr inbounds { i32, i32 }* %[[VAR31]], i32 0, i32 0
> // CHECK: %[[VAR33:[A-Za-z0-9.]+]] = getelementptr inbounds { i32, i32 }* %[[VAR31]], i32 0, i32 1
> @@ -121,7 +121,7 @@ void bar_short(void) {
> foo_short(2 - 3i);
> }
>
> -// CHECK: define void @bar_short() #0 {
> +// CHECK: define void @bar_short() [[NUW]] {
> // CHECK: %[[VAR41:[A-Za-z0-9.]+]] = alloca { i16, i16 }, align 2
> // CHECK: %[[VAR42:[A-Za-z0-9.]+]] = getelementptr inbounds { i16, i16 }* %[[VAR41]], i32 0, i32 0
> // CHECK: %[[VAR43:[A-Za-z0-9.]+]] = getelementptr inbounds { i16, i16 }* %[[VAR41]], i32 0, i32 1
> @@ -137,7 +137,7 @@ void bar_char(void) {
> foo_char(2 - 3i);
> }
>
> -// CHECK: define void @bar_char() #0 {
> +// CHECK: define void @bar_char() [[NUW]] {
> // CHECK: %[[VAR51:[A-Za-z0-9.]+]] = alloca { i8, i8 }, align 1
> // CHECK: %[[VAR52:[A-Za-z0-9.]+]] = getelementptr inbounds { i8, i8 }* %[[VAR51]], i32 0, i32 0
> // CHECK: %[[VAR53:[A-Za-z0-9.]+]] = getelementptr inbounds { i8, i8 }* %[[VAR51]], i32 0, i32 1
> @@ -153,7 +153,7 @@ void bar_long(void) {
> foo_long(2L - 3Li);
> }
>
> -// CHECK: define void @bar_long() #0 {
> +// CHECK: define void @bar_long() [[NUW]] {
> // CHECK: %[[VAR61:[A-Za-z0-9.]+]] = alloca { i64, i64 }, align 8
> // CHECK: %[[VAR62:[A-Za-z0-9.]+]] = getelementptr inbounds { i64, i64 }* %[[VAR61]], i32 0, i32 0
> // CHECK: %[[VAR63:[A-Za-z0-9.]+]] = getelementptr inbounds { i64, i64 }* %[[VAR61]], i32 0, i32 1
> @@ -169,7 +169,7 @@ void bar_long_long(void) {
> foo_long_long(2LL - 3LLi);
> }
>
> -// CHECK: define void @bar_long_long() #0 {
> +// CHECK: define void @bar_long_long() [[NUW]] {
> // CHECK: %[[VAR71:[A-Za-z0-9.]+]] = alloca { i64, i64 }, align 8
> // CHECK: %[[VAR72:[A-Za-z0-9.]+]] = getelementptr inbounds { i64, i64 }* %[[VAR71]], i32 0, i32 0
> // CHECK: %[[VAR73:[A-Za-z0-9.]+]] = getelementptr inbounds { i64, i64 }* %[[VAR71]], i32 0, i32 1
> @@ -181,4 +181,4 @@ void bar_long_long(void) {
> // CHECK: %[[VAR77:[A-Za-z0-9.]+]] = load i64* %[[VAR76]], align 1
> // CHECK: %{{[A-Za-z0-9.]+}} = call i64 @foo_long_long(i64 %[[VAR75]], i64 %[[VAR77]])
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/ppc64-complex-return.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ppc64-complex-return.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/ppc64-complex-return.c (original)
> +++ cfe/trunk/test/CodeGen/ppc64-complex-return.c Mon Feb 25 01:15:16 2013
> @@ -9,55 +9,55 @@ _Complex float foo_float(_Complex float
> return x;
> }
>
> -// CHECK: define { float, float } @foo_float(float {{[%A-Za-z0-9.]+}}, float {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { float, float } @foo_float(float {{[%A-Za-z0-9.]+}}, float {{[%A-Za-z0-9.]+}}) [[NUW:#[0-9]+]] {
>
> _Complex double foo_double(_Complex double x) {
> return x;
> }
>
> -// CHECK: define { double, double } @foo_double(double {{[%A-Za-z0-9.]+}}, double {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { double, double } @foo_double(double {{[%A-Za-z0-9.]+}}, double {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> _Complex long double foo_long_double(_Complex long double x) {
> return x;
> }
>
> -// CHECK: define { ppc_fp128, ppc_fp128 } @foo_long_double(ppc_fp128 {{[%A-Za-z0-9.]+}}, ppc_fp128 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { ppc_fp128, ppc_fp128 } @foo_long_double(ppc_fp128 {{[%A-Za-z0-9.]+}}, ppc_fp128 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> _Complex int foo_int(_Complex int x) {
> return x;
> }
>
> -// CHECK: define { i32, i32 } @foo_int(i32 {{[%A-Za-z0-9.]+}}, i32 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { i32, i32 } @foo_int(i32 {{[%A-Za-z0-9.]+}}, i32 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> _Complex short foo_short(_Complex short x) {
> return x;
> }
>
> -// CHECK: define { i16, i16 } @foo_short(i16 {{[%A-Za-z0-9.]+}}, i16 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { i16, i16 } @foo_short(i16 {{[%A-Za-z0-9.]+}}, i16 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> _Complex signed char foo_char(_Complex signed char x) {
> return x;
> }
>
> -// CHECK: define { i8, i8 } @foo_char(i8 {{[%A-Za-z0-9.]+}}, i8 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { i8, i8 } @foo_char(i8 {{[%A-Za-z0-9.]+}}, i8 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> _Complex long foo_long(_Complex long x) {
> return x;
> }
>
> -// CHECK: define { i64, i64 } @foo_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { i64, i64 } @foo_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> _Complex long long foo_long_long(_Complex long long x) {
> return x;
> }
>
> -// CHECK: define { i64, i64 } @foo_long_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) #0 {
> +// CHECK: define { i64, i64 } @foo_long_long(i64 {{[%A-Za-z0-9.]+}}, i64 {{[%A-Za-z0-9.]+}}) [[NUW]] {
>
> float bar_float(void) {
> return crealf(foo_float(2.0f - 2.5fi));
> }
>
> -// CHECK: define float @bar_float() #0 {
> +// CHECK: define float @bar_float() [[NUW]] {
> // CHECK: [[VAR1:[%A-Za-z0-9.]+]] = call { float, float } @foo_float
> // CHECK: extractvalue { float, float } [[VAR1]], 0
> // CHECK: extractvalue { float, float } [[VAR1]], 1
> @@ -66,7 +66,7 @@ double bar_double(void) {
> return creal(foo_double(2.0 - 2.5i));
> }
>
> -// CHECK: define double @bar_double() #0 {
> +// CHECK: define double @bar_double() [[NUW]] {
> // CHECK: [[VAR2:[%A-Za-z0-9.]+]] = call { double, double } @foo_double
> // CHECK: extractvalue { double, double } [[VAR2]], 0
> // CHECK: extractvalue { double, double } [[VAR2]], 1
> @@ -75,7 +75,7 @@ long double bar_long_double(void) {
> return creall(foo_long_double(2.0L - 2.5Li));
> }
>
> -// CHECK: define ppc_fp128 @bar_long_double() #0 {
> +// CHECK: define ppc_fp128 @bar_long_double() [[NUW]] {
> // CHECK: [[VAR3:[%A-Za-z0-9.]+]] = call { ppc_fp128, ppc_fp128 } @foo_long_double
> // CHECK: extractvalue { ppc_fp128, ppc_fp128 } [[VAR3]], 0
> // CHECK: extractvalue { ppc_fp128, ppc_fp128 } [[VAR3]], 1
> @@ -84,7 +84,7 @@ int bar_int(void) {
> return __real__(foo_int(2 - 3i));
> }
>
> -// CHECK: define signext i32 @bar_int() #0 {
> +// CHECK: define signext i32 @bar_int() [[NUW]] {
> // CHECK: [[VAR4:[%A-Za-z0-9.]+]] = call { i32, i32 } @foo_int
> // CHECK: extractvalue { i32, i32 } [[VAR4]], 0
> // CHECK: extractvalue { i32, i32 } [[VAR4]], 1
> @@ -93,7 +93,7 @@ short bar_short(void) {
> return __real__(foo_short(2 - 3i));
> }
>
> -// CHECK: define signext i16 @bar_short() #0 {
> +// CHECK: define signext i16 @bar_short() [[NUW]] {
> // CHECK: [[VAR5:[%A-Za-z0-9.]+]] = call { i16, i16 } @foo_short
> // CHECK: extractvalue { i16, i16 } [[VAR5]], 0
> // CHECK: extractvalue { i16, i16 } [[VAR5]], 1
> @@ -102,7 +102,7 @@ signed char bar_char(void) {
> return __real__(foo_char(2 - 3i));
> }
>
> -// CHECK: define signext i8 @bar_char() #0 {
> +// CHECK: define signext i8 @bar_char() [[NUW]] {
> // CHECK: [[VAR6:[%A-Za-z0-9.]+]] = call { i8, i8 } @foo_char
> // CHECK: extractvalue { i8, i8 } [[VAR6]], 0
> // CHECK: extractvalue { i8, i8 } [[VAR6]], 1
> @@ -111,7 +111,7 @@ long bar_long(void) {
> return __real__(foo_long(2L - 3Li));
> }
>
> -// CHECK: define i64 @bar_long() #0 {
> +// CHECK: define i64 @bar_long() [[NUW]] {
> // CHECK: [[VAR7:[%A-Za-z0-9.]+]] = call { i64, i64 } @foo_long
> // CHECK: extractvalue { i64, i64 } [[VAR7]], 0
> // CHECK: extractvalue { i64, i64 } [[VAR7]], 1
> @@ -120,10 +120,10 @@ long long bar_long_long(void) {
> return __real__(foo_long_long(2LL - 3LLi));
> }
>
> -// CHECK: define i64 @bar_long_long() #0 {
> +// CHECK: define i64 @bar_long_long() [[NUW]] {
> // CHECK: [[VAR8:[%A-Za-z0-9.]+]] = call { i64, i64 } @foo_long_long
> // CHECK: extractvalue { i64, i64 } [[VAR8]], 0
> // CHECK: extractvalue { i64, i64 } [[VAR8]], 1
>
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/ppc64-extend.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ppc64-extend.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/ppc64-extend.c (original)
> +++ cfe/trunk/test/CodeGen/ppc64-extend.c Mon Feb 25 01:15:16 2013
> @@ -2,15 +2,15 @@
> // RUN: %clang_cc1 -O0 -triple powerpc64-unknown-linux-gnu -emit-llvm -o - %s | FileCheck %s
>
> void f1(int x) { return; }
> -// CHECK: define void @f1(i32 signext %x) #0
> +// CHECK: define void @f1(i32 signext %x) [[NUW:#[0-9]+]]
>
> void f2(unsigned int x) { return; }
> -// CHECK: define void @f2(i32 zeroext %x) #0
> +// CHECK: define void @f2(i32 zeroext %x) [[NUW]]
>
> int f3(void) { return 0; }
> -// CHECK: define signext i32 @f3() #0
> +// CHECK: define signext i32 @f3() [[NUW]]
>
> unsigned int f4(void) { return 0; }
> -// CHECK: define zeroext i32 @f4() #0
> +// CHECK: define zeroext i32 @f4() [[NUW]]
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/pragma-weak.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/pragma-weak.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/pragma-weak.c (original)
> +++ cfe/trunk/test/CodeGen/pragma-weak.c Mon Feb 25 01:15:16 2013
> @@ -136,7 +136,7 @@ void __both3(void) {}
> void __a1(void) __attribute((noinline));
> #pragma weak a1 = __a1
> void __a1(void) {}
> -// CHECK: define void @__a1() #1
> +// CHECK: define void @__a1() [[NI:#[0-9]+]]
>
> // attributes introduced BEFORE a combination of #pragma weak and alias()
> // hold...
> @@ -144,11 +144,11 @@ void __a3(void) __attribute((noinline));
> #pragma weak a3 = __a3
> void a3(void) __attribute((alias("__a3")));
> void __a3(void) {}
> -// CHECK: define void @__a3() #1
> +// CHECK: define void @__a3() [[NI]]
>
> #pragma weak xxx = __xxx
> __attribute((pure,noinline,const,fastcall)) void __xxx(void) { }
> -// CHECK: void @__xxx() #2
> +// CHECK: void @__xxx() [[RN:#[0-9]+]]
>
> ///////////// PR10878: Make sure we can call a weak alias
> void SHA512Pad(void *context) {}
> @@ -180,7 +180,5 @@ void zzz(void){}
>
> int correct_linkage;
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { noinline nounwind "target-features"={{.*}} }
> -// CHECK: attributes #2 = { noinline nounwind readnone "target-features"={{.*}} }
> -// CHECK: attributes #3 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NI]] = { noinline nounwind{{.*}} }
> +// CHECK: attributes [[RN]] = { noinline nounwind readnone{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/struct-passing.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/struct-passing.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/struct-passing.c (original)
> +++ cfe/trunk/test/CodeGen/struct-passing.c Mon Feb 25 01:15:16 2013
> @@ -16,13 +16,12 @@ void __attribute__((pure)) f5(T1 a);
>
> void *ps[] = { f0, f1, f2, f3, f4, f5 };
>
> -// CHECK: declare i32 @f0() #0
> -// CHECK: declare i32 @f1() #1
> +// CHECK: declare i32 @f0() [[RN:#[0-9]+]]
> +// CHECK: declare i32 @f1() [[RO:#[0-9]+]]
> // CHECK: declare void @f2({{.*}} sret)
> // CHECK: declare void @f3({{.*}} sret)
> // CHECK: declare void @f4({{.*}} byval align 4)
> // CHECK: declare void @f5({{.*}} byval align 4)
>
> -// CHECK: attributes #0 = { nounwind readnone "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind readonly "target-features"={{.*}} }
> -// CHECK: attributes #2 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[RN]] = { nounwind readnone{{.*}} }
> +// CHECK: attributes [[RO]] = { nounwind readonly{{.*}} }
>
> Modified: cfe/trunk/test/CodeGen/unwind-attr.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/unwind-attr.c?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/unwind-attr.c (original)
> +++ cfe/trunk/test/CodeGen/unwind-attr.c Mon Feb 25 01:15:16 2013
> @@ -3,28 +3,27 @@
>
> int opaque();
>
> -// CHECK: define [[INT:i.*]] @test0() #0 {
> -// CHECK-NOEXC: define [[INT:i.*]] @test0() #0 {
> +// CHECK: define [[INT:i.*]] @test0() [[NONE:#[0-9]+]] {
> +// CHECK-NOEXC: define [[INT:i.*]] @test0() [[NUW:#[0-9]+]] {
> int test0(void) {
> return opaque();
> }
>
> // <rdar://problem/8087431>: locally infer nounwind at -O0
> -// CHECK: define [[INT:i.*]] @test1() #1 {
> -// CHECK-NOEXC: define [[INT:i.*]] @test1() #0 {
> +// CHECK: define [[INT:i.*]] @test1() [[NUW:#[0-9]+]] {
> +// CHECK-NOEXC: define [[INT:i.*]] @test1() [[NUW]] {
> int test1(void) {
> return 0;
> }
>
> // <rdar://problem/8283071>: not for weak functions
> -// CHECK: define weak [[INT:i.*]] @test2() #0 {
> -// CHECK-NOEXC: define weak [[INT:i.*]] @test2() #0 {
> +// CHECK: define weak [[INT:i.*]] @test2() [[NONE]] {
> +// CHECK-NOEXC: define weak [[INT:i.*]] @test2() [[NUW]] {
> __attribute__((weak)) int test2(void) {
> return 0;
> }
>
> -// CHECK: attributes #0 = { "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NONE]] = { {{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> -// CHECK-NOEXC: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK-NOEXC: attributes #1 = { "target-features"={{.*}} }
> +// CHECK-NOEXC: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp Mon Feb 25 01:15:16 2013
> @@ -5,17 +5,17 @@ int t(void);
>
> // CHECK: define i32 @_Z1fv() {{.*}} {
> int f(void) {
> - // CHECK: call i32 @_Z1cv() [[NUW_RN:#[0-9]+]]
> - // CHECK: call i32 @_Z1pv() [[NUW_RO:#[0-9]+]]
> + // CHECK: call i32 @_Z1cv() [[NUW_RN1:#[0-9]+]]
> + // CHECK: call i32 @_Z1pv() [[NUW_RO1:#[0-9]+]]
> return c() + p() + t();
> }
>
> -// CHECK: declare i32 @_Z1cv() #1
> -// CHECK: declare i32 @_Z1pv() #2
> -// CHECK: declare i32 @_Z1tv() #0
> +// CHECK: declare i32 @_Z1cv() [[NUW_RN2:#[0-9]+]]
> +// CHECK: declare i32 @_Z1pv() [[NUW_RO2:#[0-9]+]]
> +// CHECK: declare i32 @_Z1tv() [[NONE:#[0-9]+]]
>
> -// CHECK: attributes #0 = { "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind readnone "target-features"={{.*}} }
> -// CHECK: attributes #2 = { nounwind readonly "target-features"={{.*}} }
> -// CHECK: attributes [[NUW_RN]] = { nounwind readnone }
> -// CHECK: attributes [[NUW_RO]] = { nounwind readonly }
> +// CHECK: attributes [[NONE]] = { {{.*}} }
> +// CHECK: attributes [[NUW_RN2]] = { nounwind readnone{{.*}} }
> +// CHECK: attributes [[NUW_RO2]] = { nounwind readonly{{.*}} }
> +// CHECK: attributes [[NUW_RN1]] = { nounwind readnone }
> +// CHECK: attributes [[NUW_RO1]] = { nounwind readonly }
>
> Modified: cfe/trunk/test/CodeGenCXX/attr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/attr.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/attr.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/attr.cpp Mon Feb 25 01:15:16 2013
> @@ -2,7 +2,7 @@
>
> // CHECK: @test2 = alias i32 ()* @_Z5test1v
>
> -// CHECK: define i32 @_Z3foov() #0 align 1024
> +// CHECK: define i32 @_Z3foov() [[NUW:#[0-9]+]] align 1024
> int foo() __attribute__((aligned(1024)));
> int foo() { }
>
> @@ -13,16 +13,16 @@ class C {
> void bar4() __attribute__((aligned(1024)));
> } c;
>
> -// CHECK: define void @_ZN1C4bar1Ev(%class.C* %this) unnamed_addr #0 align 2
> +// CHECK: define void @_ZN1C4bar1Ev(%class.C* %this) unnamed_addr [[NUW]] align 2
> void C::bar1() { }
>
> -// CHECK: define void @_ZN1C4bar2Ev(%class.C* %this) unnamed_addr #0 align 2
> +// CHECK: define void @_ZN1C4bar2Ev(%class.C* %this) unnamed_addr [[NUW]] align 2
> void C::bar2() { }
>
> -// CHECK: define void @_ZN1C4bar3Ev(%class.C* %this) unnamed_addr #0 align 1024
> +// CHECK: define void @_ZN1C4bar3Ev(%class.C* %this) unnamed_addr [[NUW]] align 1024
> void C::bar3() { }
>
> -// CHECK: define void @_ZN1C4bar4Ev(%class.C* %this) #0 align 1024
> +// CHECK: define void @_ZN1C4bar4Ev(%class.C* %this) [[NUW]] align 1024
> void C::bar4() { }
>
> // PR6635
> @@ -31,7 +31,4 @@ int test1() { return 10; }
> // CHECK at top of file
> extern "C" int test2() __attribute__((alias("_Z5test1v")));
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { noreturn nounwind }
> -// CHECK: attributes #2 = { nounwind }
> -// CHECK: attributes #3 = { inlinehint nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp Mon Feb 25 01:15:16 2013
> @@ -10,99 +10,99 @@ template<typename T> struct S {
> static void g() noexcept(sizeof(T) == 4);
> };
>
> -// CHECK: define {{.*}} @_Z1fIsEvv() #0 {
> +// CHECK: define {{.*}} @_Z1fIsEvv() [[NONE:#[0-9]+]] {
> template<> void f<short>() { h(); }
> -// CHECK: define {{.*}} @_Z1fIA2_sEvv() #1 {
> +// CHECK: define {{.*}} @_Z1fIA2_sEvv() [[NUW:#[0-9]+]] {
> template<> void f<short[2]>() noexcept { h(); }
>
> // CHECK: define {{.*}} @_ZN1SIsE1fEv()
> -// CHECK-NOT: #1
> +// CHECK-NOT: [[NUW]]
> template<> void S<short>::f() { h(); }
> -// CHECK: define {{.*}} @_ZN1SIA2_sE1fEv() #1
> +// CHECK: define {{.*}} @_ZN1SIA2_sE1fEv() [[NUW]]
> template<> void S<short[2]>::f() noexcept { h(); }
>
> -// CHECK: define {{.*}} @_Z1fIDsEvv() #0 {
> +// CHECK: define {{.*}} @_Z1fIDsEvv() [[NONE]] {
> template void f<char16_t>();
> -// CHECK: define {{.*}} @_Z1fIA2_DsEvv() #1 {
> +// CHECK: define {{.*}} @_Z1fIA2_DsEvv() [[NUW]] {
> template void f<char16_t[2]>();
>
> // CHECK: define {{.*}} @_ZN1SIDsE1fEv()
> -// CHECK-NOT: #1
> +// CHECK-NOT: [[NUW]]
> template void S<char16_t>::f();
> -// CHECK: define {{.*}} @_ZN1SIA2_DsE1fEv() #1
> +// CHECK: define {{.*}} @_ZN1SIA2_DsE1fEv() [[NUW]]
> template void S<char16_t[2]>::f();
>
> void h() {
> - // CHECK: define {{.*}} @_Z1fIiEvv() #1 {
> + // CHECK: define {{.*}} @_Z1fIiEvv() [[NUW]] {
> f<int>();
> - // CHECK: define {{.*}} @_Z1fIA2_iEvv() #0 {
> + // CHECK: define {{.*}} @_Z1fIA2_iEvv() [[NONE]] {
> f<int[2]>();
>
> - // CHECK: define {{.*}} @_ZN1SIiE1fEv() #1
> + // CHECK: define {{.*}} @_ZN1SIiE1fEv() [[NUW]]
> S<int>::f();
> // CHECK: define {{.*}} @_ZN1SIA2_iE1fEv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> S<int[2]>::f();
>
> - // CHECK: define {{.*}} @_Z1fIfEvv() #1 {
> + // CHECK: define {{.*}} @_Z1fIfEvv() [[NUW]] {
> void (*f1)() = &f<float>;
> - // CHECK: define {{.*}} @_Z1fIdEvv() #0 {
> + // CHECK: define {{.*}} @_Z1fIdEvv() [[NONE]] {
> void (*f2)() = &f<double>;
>
> - // CHECK: define {{.*}} @_ZN1SIfE1fEv() #1
> + // CHECK: define {{.*}} @_ZN1SIfE1fEv() [[NUW]]
> void (*f3)() = &S<float>::f;
> // CHECK: define {{.*}} @_ZN1SIdE1fEv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> void (*f4)() = &S<double>::f;
>
> - // CHECK: define {{.*}} @_Z1fIA4_cEvv() #1 {
> + // CHECK: define {{.*}} @_Z1fIA4_cEvv() [[NUW]] {
> (void)&f<char[4]>;
> - // CHECK: define {{.*}} @_Z1fIcEvv() #0 {
> + // CHECK: define {{.*}} @_Z1fIcEvv() [[NONE]] {
> (void)&f<char>;
>
> - // CHECK: define {{.*}} @_ZN1SIA4_cE1fEv() #1
> + // CHECK: define {{.*}} @_ZN1SIA4_cE1fEv() [[NUW]]
> (void)&S<char[4]>::f;
> // CHECK: define {{.*}} @_ZN1SIcE1fEv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> (void)&S<char>::f;
> }
>
> // CHECK: define {{.*}} @_Z1iv
> void i() {
> - // CHECK: declare {{.*}} @_Z1gIiEvv() #1
> + // CHECK: declare {{.*}} @_Z1gIiEvv() [[NUW]]
> g<int>();
> // CHECK: declare {{.*}} @_Z1gIA2_iEvv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> g<int[2]>();
>
> - // CHECK: declare {{.*}} @_ZN1SIiE1gEv() #1
> + // CHECK: declare {{.*}} @_ZN1SIiE1gEv() [[NUW]]
> S<int>::g();
> // CHECK: declare {{.*}} @_ZN1SIA2_iE1gEv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> S<int[2]>::g();
>
> - // CHECK: declare {{.*}} @_Z1gIfEvv() #1
> + // CHECK: declare {{.*}} @_Z1gIfEvv() [[NUW]]
> void (*g1)() = &g<float>;
> // CHECK: declare {{.*}} @_Z1gIdEvv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> void (*g2)() = &g<double>;
>
> - // CHECK: declare {{.*}} @_ZN1SIfE1gEv() #1
> + // CHECK: declare {{.*}} @_ZN1SIfE1gEv() [[NUW]]
> void (*g3)() = &S<float>::g;
> // CHECK: declare {{.*}} @_ZN1SIdE1gEv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> void (*g4)() = &S<double>::g;
>
> - // CHECK: declare {{.*}} @_Z1gIA4_cEvv() #1
> + // CHECK: declare {{.*}} @_Z1gIA4_cEvv() [[NUW]]
> (void)&g<char[4]>;
> // CHECK: declare {{.*}} @_Z1gIcEvv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> (void)&g<char>;
>
> - // CHECK: declare {{.*}} @_ZN1SIA4_cE1gEv() #1
> + // CHECK: declare {{.*}} @_ZN1SIA4_cE1gEv() [[NUW]]
> (void)&S<char[4]>::g;
> // CHECK: declare {{.*}} @_ZN1SIcE1gEv()
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> (void)&S<char>::g;
> }
>
> @@ -113,12 +113,11 @@ template<typename T> struct Nested {
> // CHECK: define {{.*}} @_Z1jv
> void j() {
> // CHECK: declare {{.*}} @_ZN6NestedIiE1fILb1EcEEvv(
> - // CHECK-NOT: #1
> + // CHECK-NOT: [[NUW]]
> Nested<int>().f<true, char>();
> - // CHECK: declare {{.*}} @_ZN6NestedIlE1fILb0ElEEvv({{.*}}) #1
> + // CHECK: declare {{.*}} @_ZN6NestedIlE1fILb0ElEEvv({{.*}}) [[NUW]]
> Nested<long>().f<false, long>();
> }
>
> -// CHECK: attributes #0 = { "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #2 = { noinline noreturn nounwind }
> +// CHECK: attributes [[NONE]] = { {{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/default-destructor-synthesis.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/default-destructor-synthesis.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/default-destructor-synthesis.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/default-destructor-synthesis.cpp Mon Feb 25 01:15:16 2013
> @@ -24,7 +24,7 @@ struct M : Q, P {
> Q q_arr[2][3];
> };
>
> -// CHECK: define i32 @_Z1fv() #0
> +// CHECK: define i32 @_Z1fv() [[NUW:#[0-9]+]]
> int f() {
> {
> count = 1;
> @@ -35,4 +35,4 @@ int f() {
> return count;
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/derived-to-base.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/derived-to-base.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/derived-to-base.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/derived-to-base.cpp Mon Feb 25 01:15:16 2013
> @@ -15,7 +15,7 @@ void f() {
> b.f();
> }
>
> -// CHECK: define %struct.B* @_Z1fP1A(%struct.A* %a) #0
> +// CHECK: define %struct.B* @_Z1fP1A(%struct.A* %a) [[NUW:#[0-9]+]]
> B *f(A *a) {
> // CHECK-NOT: br label
> // CHECK: ret %struct.B*
> @@ -25,7 +25,7 @@ B *f(A *a) {
> // PR5965
> namespace PR5965 {
>
> -// CHECK: define %struct.A* @_ZN6PR59651fEP1B(%struct.B* %b) #0
> +// CHECK: define %struct.A* @_ZN6PR59651fEP1B(%struct.B* %b) [[NUW]]
> A *f(B* b) {
> // CHECK-NOT: br label
> // CHECK: ret %struct.A*
> @@ -46,5 +46,4 @@ namespace test3 {
> }
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/exceptions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/exceptions.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/exceptions.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/exceptions.cpp Mon Feb 25 01:15:16 2013
> @@ -71,7 +71,7 @@ namespace test1 {
>
> // rdar://11904428
> // Terminate landing pads should call __cxa_begin_catch first.
> - // CHECK: define linkonce_odr hidden void @__clang_call_terminate(i8*) #2
> + // CHECK: define linkonce_odr hidden void @__clang_call_terminate(i8*) [[NI_NR_NUW:#[0-9]+]]
> // CHECK-NEXT: [[T0:%.*]] = call i8* @__cxa_begin_catch(i8* %0) [[NUW:#[0-9]+]]
> // CHECK-NEXT: call void @_ZSt9terminatev() [[NR_NUW:#[0-9]+]]
> // CHECK-NEXT: unreachable
> @@ -526,10 +526,7 @@ namespace test11 {
> // (After this is a terminate landingpad.)
> }
>
> -// CHECK: attributes #0 = { "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #2 = { noinline noreturn nounwind }
> -// CHECK: attributes #3 = { nounwind readnone }
> +// CHECK: attributes [[NI_NR_NUW]] = { noinline noreturn nounwind }
>
> // CHECK: attributes [[NUW]] = { nounwind }
> // CHECK: attributes [[NR_NUW]] = { noreturn nounwind }
>
> Modified: cfe/trunk/test/CodeGenCXX/global-dtor-no-atexit.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/global-dtor-no-atexit.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/global-dtor-no-atexit.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/global-dtor-no-atexit.cpp Mon Feb 25 01:15:16 2013
> @@ -5,12 +5,12 @@
>
> // CHECK: call void @_ZN1AC1Ev([[A:%.*]]* @a)
> // CHECK-NEXT: call i32 @atexit(void ()* @__dtor_a)
> -// CHECK: define internal void @__dtor_a() #0
> +// CHECK: define internal void @__dtor_a() [[NUW:#[0-9]+]]
> // CHECK: call void @_ZN1AD1Ev([[A]]* @a)
>
> // CHECK: call void @_ZN1AC1Ev([[A]]* @b)
> // CHECK-NEXT: call i32 @atexit(void ()* @__dtor_b)
> -// CHECK: define internal void @__dtor_b() #0
> +// CHECK: define internal void @__dtor_b() [[NUW]]
> // CHECK: call void @_ZN1AD1Ev([[A]]* @b)
>
> class A {
> @@ -33,16 +33,14 @@ A a, b;
> // CHECK-NEXT: call i32 @atexit(void ()* @__dtor__ZZ4funcvE2a2)
> // CHECK-NEXT: call void @__cxa_guard_release(i64* @_ZGVZ4funcvE2a2)
>
> -// CHECK: define internal void @__dtor__ZZ4funcvE2a1() #0
> +// CHECK: define internal void @__dtor__ZZ4funcvE2a1() [[NUW]]
> // CHECK: call void @_ZN1AD1Ev([[A]]* @_ZZ4funcvE2a1)
>
> -// CHECK: define internal void @__dtor__ZZ4funcvE2a2() #0
> +// CHECK: define internal void @__dtor__ZZ4funcvE2a2() [[NUW]]
> // CHECK: call void @_ZN1AD1Ev([[A]]* @_ZZ4funcvE2a2)
>
> void func() {
> static A a1, a2;
> }
>
> -// CHECK: attributes #0 = { nounwind }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> -// CHECK: attributes #2 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind }
>
> Modified: cfe/trunk/test/CodeGenCXX/global-init.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/global-init.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/global-init.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/global-init.cpp Mon Feb 25 01:15:16 2013
> @@ -200,15 +200,6 @@ namespace test7 {
> // CHECK: call void [[TEST1_Z_INIT]]
>
> // rdar://problem/8090834: this should be nounwind
> -// CHECK-NOEXC: define internal void @_GLOBAL__I_a() #0 section "__TEXT,__StaticInit,regular,pure_instructions" {
> +// CHECK-NOEXC: define internal void @_GLOBAL__I_a() [[NUW:#[0-9]+]] section "__TEXT,__StaticInit,regular,pure_instructions" {
>
> -// CHECK: attributes #0 = { "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind }
> -// CHECK: attributes #2 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #3 = { noinline noreturn nounwind }
> -// CHECK: attributes #4 = { nounwind readonly }
> -
> -// CHECK-NOEXC: attributes #0 = { nounwind }
> -// CHECK-NOEXC: attributes #1 = { "target-features"={{.*}} }
> -// CHECK-NOEXC: attributes #2 = { nounwind "target-features"={{.*}} }
> -// CHECK-NOEXC: attributes #3 = { nounwind readonly }
> +// CHECK-NOEXC: attributes [[NUW]] = { nounwind }
>
> Modified: cfe/trunk/test/CodeGenCXX/member-initializers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/member-initializers.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/member-initializers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/member-initializers.cpp Mon Feb 25 01:15:16 2013
> @@ -21,7 +21,7 @@ int f() {
> }
>
> // Test that we don't try to fold the default value of j when initializing i.
> -// CHECK: define i32 @_Z9test_foldv() #0
> +// CHECK: define i32 @_Z9test_foldv() [[NUW_RN:#[0-9]+]]
> int test_fold() {
> struct A {
> A(const int j = 1) : i(j) { }
> @@ -32,4 +32,4 @@ int test_fold() {
> return A(2).i;
> }
>
> -// CHECK: attributes #0 = { nounwind readnone "target-features"={{.*}} }
> +// CHECK: attributes [[NUW_RN]] = { nounwind readnone{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp Mon Feb 25 01:15:16 2013
> @@ -5,7 +5,7 @@ struct ClassWithoutDtor {
> };
>
> void check_array_no_cookies() {
> -// CHECK: define void @"\01?check_array_no_cookies@@YAXXZ"() #0
> +// CHECK: define void @"\01?check_array_no_cookies@@YAXXZ"() [[NUW:#[0-9]+]]
>
> // CHECK: call noalias i8* @"\01??_U at YAPAXI@Z"(i32 42)
> ClassWithoutDtor *array = new ClassWithoutDtor[42];
> @@ -58,5 +58,4 @@ void check_array_cookies_aligned() {
> // CHECK: getelementptr inbounds i8* [[ARRAY_AS_CHAR]], i64 -8
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp Mon Feb 25 01:15:16 2013
> @@ -5,12 +5,12 @@ struct S {
> ~S() {}
> } s;
>
> -// CHECK: define internal void [[INIT_s:@.*global_var.*]] #0
> +// CHECK: define internal void [[INIT_s:@.*global_var.*]] [[NUW:#[0-9]+]]
> // CHECK: %{{[.0-9A-Z_a-z]+}} = call x86_thiscallcc %struct.S* @"\01??0S@@QAE at XZ"
> // CHECK: call i32 @atexit(void ()* @"__dtor_\01?s@@3US@@A")
> // CHECK: ret void
>
> -// CHECK: define internal void @"__dtor_\01?s@@3US@@A"() #0 {
> +// CHECK: define internal void @"__dtor_\01?s@@3US@@A"() [[NUW]] {
> // CHECK: call x86_thiscallcc void @"\01??1S@@QAE at XZ"
> // CHECK: ret void
>
> @@ -33,7 +33,7 @@ void force_usage() {
> (void)B<int>::foo; // (void) - force usage
> }
>
> -// CHECK: define internal void [[INIT_foo:@.*global_var.*]] #0
> +// CHECK: define internal void [[INIT_foo:@.*global_var.*]] [[NUW]]
> // CHECK: %{{[.0-9A-Z_a-z]+}} = call x86_thiscallcc %class.A* @"\01??0A@@QAE at XZ"
> // CHECK: call i32 @atexit(void ()* [[FOO_DTOR:@"__dtor_.*foo at .*]])
> // CHECK: ret void
> @@ -46,10 +46,9 @@ void force_usage() {
> // CHECK: call x86_thiscallcc void @"\01??1A@@QAE at XZ"{{.*}}foo
> // CHECK: ret void
>
> -// CHECK: define internal void @_GLOBAL__I_a() #0 {
> +// CHECK: define internal void @_GLOBAL__I_a() [[NUW]] {
> // CHECK: call void [[INIT_s]]
> // CHECK: call void [[INIT_foo]]
> // CHECK: ret void
>
> -// CHECK: attributes #0 = { nounwind }
> -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind }
>
> Modified: cfe/trunk/test/CodeGenCXX/no-exceptions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/no-exceptions.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/no-exceptions.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/no-exceptions.cpp Mon Feb 25 01:15:16 2013
> @@ -2,7 +2,7 @@
>
> void g();
>
> -// CHECK: define void @_Z1fv() #0
> +// CHECK: define void @_Z1fv() [[NUW:#[0-9]+]]
> void f() throw (int) {
>
> // CHECK-NOT: invoke void @_Z1gv
> @@ -11,5 +11,4 @@ void f() throw (int) {
> // CHECK: ret void
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/pointers-to-data-members.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pointers-to-data-members.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/pointers-to-data-members.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/pointers-to-data-members.cpp Mon Feb 25 01:15:16 2013
> @@ -151,13 +151,13 @@ struct A {
> A() : a() {}
> };
>
> -// CHECK-O3: define zeroext i1 @_ZN6PR71395checkEv() #0
> +// CHECK-O3: define zeroext i1 @_ZN6PR71395checkEv() [[NUW:#[0-9]+]]
> bool check() {
> // CHECK-O3: ret i1 true
> return A().a.data == 0;
> }
>
> -// CHECK-O3: define zeroext i1 @_ZN6PR71396check2Ev() #0
> +// CHECK-O3: define zeroext i1 @_ZN6PR71396check2Ev() [[NUW]]
> bool check2() {
> // CHECK-O3: ret i1 true
> return ptr_to_member_type() == 0;
> @@ -255,7 +255,4 @@ namespace PR13097 {
> // CHECK: call void @_ZN7PR130971XC1ERKS0_
> }
>
> -// CHECK-O3: attributes #0 = { nounwind readnone "target-features"={{.*}} }
> -// CHECK-O3: attributes #1 = { nounwind "target-features"={{.*}} }
> -// CHECK-O3: attributes #2 = { "target-features"={{.*}} }
> -// CHECK-O3: attributes #3 = { nounwind }
> +// CHECK-O3: attributes [[NUW]] = { nounwind readnone{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/reference-cast.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/reference-cast.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/reference-cast.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/reference-cast.cpp Mon Feb 25 01:15:16 2013
> @@ -3,7 +3,7 @@
> // PR6024
> extern int i;
>
> -// CHECK: define i32* @_Z16lvalue_noop_castv() #0
> +// CHECK: define i32* @_Z16lvalue_noop_castv() [[NUW:#[0-9]+]]
> const int &lvalue_noop_cast() {
> if (i == 0)
> // CHECK: store i32 17, i32*
> @@ -193,5 +193,4 @@ namespace PR10650 {
> // CHECK: store i64
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/threadsafe-statics.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/threadsafe-statics.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/threadsafe-statics.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/threadsafe-statics.cpp Mon Feb 25 01:15:16 2013
> @@ -6,7 +6,7 @@ int f();
> // WITH-TSS: @_ZZ1gvE1a = internal global i32 0, align 4
> // WITH-TSS: @_ZGVZ1gvE1a = internal global i64 0
>
> -// WITH-TSS: define void @_Z1gv() #0
> +// WITH-TSS: define void @_Z1gv() [[NUW:#[0-9]+]]
> // WITH-TSS: call i32 @__cxa_guard_acquire
> // WITH-TSS: call void @__cxa_guard_release
> // WITH-TSS: ret void
> @@ -17,14 +17,11 @@ void g() {
> // NO-TSS: @_ZZ1gvE1a = internal global i32 0, align 4
> // NO-TSS: @_ZGVZ1gvE1a = internal global i8 0
>
> -// NO-TSS: define void @_Z1gv() #0
> +// NO-TSS: define void @_Z1gv() [[NUW:#[0-9]+]]
> // NO-TSS-NOT: call i32 @__cxa_guard_acquire
> // NO-TSS-NOT: call void @__cxa_guard_release
> // NO-TSS: ret void
>
> -// WITH-TSS: attributes #0 = { nounwind "target-features"={{.*}} }
> -// WITH-TSS: attributes #1 = { nounwind }
> -// WITH-TSS: attributes #2 = { "target-features"={{.*}} }
> +// WITH-TSS: attributes [[NUW]] = { nounwind{{.*}} }
>
> -// NO-TSS: attributes #0 = { nounwind "target-features"={{.*}} }
> -// NO-TSS: attributes #1 = { "target-features"={{.*}} }
> +// NO-TSS: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/thunks.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/thunks.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/thunks.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/thunks.cpp Mon Feb 25 01:15:16 2013
> @@ -339,7 +339,7 @@ namespace Test14 {
> };
> void C::f() {
> }
> - // CHECK: define void @_ZThn8_N6Test141C1fEv({{.*}}) unnamed_addr #0
> + // CHECK: define void @_ZThn8_N6Test141C1fEv({{.*}}) unnamed_addr [[NUW:#[0-9]+]]
> }
>
> /**** The following has to go at the end of the file ****/
> @@ -348,7 +348,4 @@ namespace Test14 {
> // CHECK: define linkonce_odr void @_ZTv0_n24_N5Test51B1fEv
> // CHECK: define internal void @_ZThn8_N6Test4B12_GLOBAL__N_11C1fEv(
>
> -// CHECK: attributes #0 = { nounwind uwtable "target-features"={{.*}} }
> -// CHECK: attributes #1 = { inlinehint nounwind uwtable "target-features"={{.*}} }
> -// CHECK: attributes #2 = { "target-features"={{.*}} }
> -// CHECK: attributes #3 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind uwtable{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp Mon Feb 25 01:15:16 2013
> @@ -11,25 +11,25 @@ struct D : virtual C, virtual CC { int e
> D* x;
>
> A* a() { return x; }
> -// CHECK: @_Z1av() #0
> +// CHECK: @_Z1av() [[NUW:#[0-9]+]]
> // CHECK: [[VBASEOFFSETPTRA:%[a-zA-Z0-9\.]+]] = getelementptr i8* {{.*}}, i64 -16
> // CHECK: [[CASTVBASEOFFSETPTRA:%[a-zA-Z0-9\.]+]] = bitcast i8* [[VBASEOFFSETPTRA]] to i32*
> // CHECK: load i32* [[CASTVBASEOFFSETPTRA]]
> // CHECK: }
>
> B* b() { return x; }
> -// CHECK: @_Z1bv() #0
> +// CHECK: @_Z1bv() [[NUW]]
> // CHECK: [[VBASEOFFSETPTRA:%[a-zA-Z0-9\.]+]] = getelementptr i8* {{.*}}, i64 -20
> // CHECK: [[CASTVBASEOFFSETPTRA:%[a-zA-Z0-9\.]+]] = bitcast i8* [[VBASEOFFSETPTRA]] to i32*
> // CHECK: load i32* [[CASTVBASEOFFSETPTRA]]
> // CHECK: }
>
> BB* c() { return x; }
> -// CHECK: @_Z1cv() #0
> +// CHECK: @_Z1cv() [[NUW]]
> // CHECK: [[VBASEOFFSETPTRC:%[a-zA-Z0-9\.]+]] = getelementptr i8* {{.*}}, i64 -24
> // CHECK: [[CASTVBASEOFFSETPTRC:%[a-zA-Z0-9\.]+]] = bitcast i8* [[VBASEOFFSETPTRC]] to i32*
> // CHECK: [[VBASEOFFSETC:%[a-zA-Z0-9\.]+]] = load i32* [[CASTVBASEOFFSETPTRC]]
> // CHECK: add i32 [[VBASEOFFSETC]], 8
> // CHECK: }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenObjC/arc.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/arc.m?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/arc.m (original)
> +++ cfe/trunk/test/CodeGenObjC/arc.m Mon Feb 25 01:15:16 2013
> @@ -9,7 +9,7 @@
> // ARC-ALIEN: declare extern_weak void @objc_storeStrong(i8**, i8*)
> // ARC-ALIEN: declare extern_weak i8* @objc_retain(i8*)
> // ARC-ALIEN: declare extern_weak i8* @objc_autoreleaseReturnValue(i8*)
> -// ARC-ALIEN: declare i8* @objc_msgSend(i8*, i8*, ...) #1
> +// ARC-ALIEN: declare i8* @objc_msgSend(i8*, i8*, ...) [[NLB:#[0-9]+]]
> // ARC-ALIEN: declare extern_weak void @objc_release(i8*)
> // ARC-ALIEN: declare extern_weak i8* @objc_retainAutoreleasedReturnValue(i8*)
> // ARC-ALIEN: declare extern_weak i8* @objc_initWeak(i8**, i8*)
> @@ -20,10 +20,10 @@
> // ARC-ALIEN: declare extern_weak i8* @objc_retainAutorelease(i8*)
>
> // ARC-NATIVE: declare void @objc_storeStrong(i8**, i8*)
> -// ARC-NATIVE: declare i8* @objc_retain(i8*) #1
> +// ARC-NATIVE: declare i8* @objc_retain(i8*) [[NLB:#[0-9]+]]
> // ARC-NATIVE: declare i8* @objc_autoreleaseReturnValue(i8*)
> -// ARC-NATIVE: declare i8* @objc_msgSend(i8*, i8*, ...) #1
> -// ARC-NATIVE: declare void @objc_release(i8*) #1
> +// ARC-NATIVE: declare i8* @objc_msgSend(i8*, i8*, ...) [[NLB]]
> +// ARC-NATIVE: declare void @objc_release(i8*) [[NLB]]
> // ARC-NATIVE: declare i8* @objc_retainAutoreleasedReturnValue(i8*)
> // ARC-NATIVE: declare i8* @objc_initWeak(i8**, i8*)
> // ARC-NATIVE: declare i8* @objc_storeWeak(i8**, i8*)
> @@ -1484,7 +1484,6 @@ void test70(id i) {
> };
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nonlazybind }
> -// CHECK: attributes #2 = { "target-features"={{.*}} }
> +// ARC-ALIEN: attributes [[NLB]] = { nonlazybind }
> +// ARC-NATIVE: attributes [[NLB]] = { nonlazybind }
> // CHECK: attributes [[NUW]] = { nounwind }
>
> Modified: cfe/trunk/test/CodeGenObjC/gnu-exceptions.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/gnu-exceptions.m?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/gnu-exceptions.m (original)
> +++ cfe/trunk/test/CodeGenObjC/gnu-exceptions.m Mon Feb 25 01:15:16 2013
> @@ -6,7 +6,7 @@ void log(int i);
>
> @class C;
>
> -// CHECK: define void @test0() #0 {
> +// CHECK: define void @test0() [[TF:#[0-9]+]] {
> void test0() {
> @try {
> // CHECK: invoke void @opaque()
> @@ -31,5 +31,4 @@ void test0() {
> log(1);
> }
>
> -// CHECK: attributes #0 = { "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nounwind readnone }
> +// CHECK: attributes [[TF]] = { "{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenObjC/nonlazy-msgSend.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/nonlazy-msgSend.m?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/nonlazy-msgSend.m (original)
> +++ cfe/trunk/test/CodeGenObjC/nonlazy-msgSend.m Mon Feb 25 01:15:16 2013
> @@ -1,9 +1,8 @@
> // RUN: %clang_cc1 -triple x86_64-apple-darwin9 -fobjc-runtime=macosx-fragile-10.5 -emit-llvm %s -o - | FileCheck %s
>
> -// CHECK: declare i8* @objc_msgSend(i8*, i8*, ...) #1
> +// CHECK: declare i8* @objc_msgSend(i8*, i8*, ...) [[NLB:#[0-9]+]]
> void f0(id x) {
> [x foo];
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nonlazybind }
> +// CHECK: attributes [[NLB]] = { nonlazybind }
>
> Modified: cfe/trunk/test/CodeGenObjC/objc-literal-debugger-test.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/objc-literal-debugger-test.m?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/objc-literal-debugger-test.m (original)
> +++ cfe/trunk/test/CodeGenObjC/objc-literal-debugger-test.m Mon Feb 25 01:15:16 2013
> @@ -50,7 +50,6 @@ int main() {
> #endif
> }
>
> -// CHECK: declare i8* @objc_msgSend(i8*, i8*, ...) #1
> +// CHECK: declare i8* @objc_msgSend(i8*, i8*, ...) [[NLB:#[0-9]+]]
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nonlazybind }
> +// CHECK: attributes [[NLB]] = { nonlazybind }
>
> Modified: cfe/trunk/test/CodeGenObjC/objc-literal-tests.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/objc-literal-tests.m?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/objc-literal-tests.m (original)
> +++ cfe/trunk/test/CodeGenObjC/objc-literal-tests.m Mon Feb 25 01:15:16 2013
> @@ -53,7 +53,7 @@ typedef signed char BOOL;
>
> id NSUserName();
>
> -// CHECK: define i32 @main() #0
> +// CHECK: define i32 @main() [[NUW:#[0-9]+]]
> int main() {
> // CHECK: call{{.*}}@objc_msgSend{{.*}}i8 signext 97
> NSNumber *aNumber = @'a';
> @@ -94,6 +94,4 @@ void baz(void) {
> bar(^(void) { return YES; });
> }
>
> -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
> -// CHECK: attributes #1 = { nonlazybind }
> -// CHECK: attributes #2 = { "target-features"={{.*}} }
> +// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/CodeGenObjCXX/lambda-expressions.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/lambda-expressions.mm?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjCXX/lambda-expressions.mm (original)
> +++ cfe/trunk/test/CodeGenObjCXX/lambda-expressions.mm Mon Feb 25 01:15:16 2013
> @@ -25,24 +25,19 @@ typedef int (^fp)();
> fp global;
> void f2() { global = []{ return 3; }; }
>
> -// MRC: define void @_Z2f2v() #1 {
> +// MRC: define void @_Z2f2v() [[NUW:#[0-9]+]] {
> // MRC: store i8* bitcast (i32 (i8*)* @___Z2f2v_block_invoke to i8*),
> // MRC-NOT: call
> // MRC: ret void
> // ("global" contains a dangling pointer after this function runs.)
>
> -// ARC: define void @_Z2f2v() #1 {
> +// ARC: define void @_Z2f2v() [[NUW:#[0-9]+]] {
> // ARC: store i8* bitcast (i32 (i8*)* @___Z2f2v_block_invoke to i8*),
> // ARC: call i8* @objc_retainBlock
> // ARC: call void @objc_release
> // ARC: define internal i32 @___Z2f2v_block_invoke
> // ARC: call i32 @"_ZZ2f2vENK3$_1clEv
>
> -// ARC: attributes #0 = { "target-features"={{.*}} }
> -// ARC: attributes #1 = { nounwind "target-features"={{.*}} }
> -// ARC: attributes #2 = { inlinehint nounwind "target-features"={{.*}} }
> +// ARC: attributes [[NUW]] = { nounwind{{.*}} }
>
> -// MRC: attributes #0 = { "target-features"={{.*}} }
> -// MRC: attributes #1 = { nounwind "target-features"={{.*}} }
> -// MRC: attributes #2 = { inlinehint nounwind "target-features"={{.*}} }
> -// MRC: attributes #3 = { nonlazybind }
> +// MRC: attributes [[NUW]] = { nounwind{{.*}} }
>
> Modified: cfe/trunk/test/Driver/darwin-iphone-defaults.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-iphone-defaults.m?rev=176009&r1=176008&r2=176009&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/darwin-iphone-defaults.m (original)
> +++ cfe/trunk/test/Driver/darwin-iphone-defaults.m Mon Feb 25 01:15:16 2013
> @@ -1,6 +1,6 @@
> // RUN: %clang -target i386-apple-darwin9 -miphoneos-version-min=3.0 -arch armv7 -flto -S -o - %s | FileCheck %s
>
> -// CHECK: @f0() #0
> +// CHECK: @f0() [[F0:#[0-9]+]]
> // CHECK: @__f0_block_invoke
> // CHECK: void @f1
> // CHECK-NOT: msgSend_fixup_alloc
> @@ -26,5 +26,4 @@ void f1() {
> [I1 alloc];
> }
>
> -// CHECK: attributes #0 = { ssp "target-cpu"="cortex-a8" "target-features"="+neon" }
> -// CHECK: attributes #1 = { nonlazybind }
> +// CHECK: attributes [[F0]] = { ssp{{.*}} }
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list