From be7ea19b585dc1b0d4c4358df3ca498ceb65b969 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Mon, 15 Dec 2014 19:07:53 +0000 Subject: IR: Make metadata typeless in assembly Now that `Metadata` is typeless, reflect that in the assembly. These are the matching assembly changes for the metadata/value split in r223802. - Only use the `metadata` type when referencing metadata from a call intrinsic -- i.e., only when it's used as a `Value`. - Stop pretending that `ValueAsMetadata` is wrapped in an `MDNode` when referencing it from call intrinsics. So, assembly like this: define @foo(i32 %v) { call void @llvm.foo(metadata !{i32 %v}, metadata !0) call void @llvm.foo(metadata !{i32 7}, metadata !0) call void @llvm.foo(metadata !1, metadata !0) call void @llvm.foo(metadata !3, metadata !0) call void @llvm.foo(metadata !{metadata !3}, metadata !0) ret void, !bar !2 } !0 = metadata !{metadata !2} !1 = metadata !{i32* @global} !2 = metadata !{metadata !3} !3 = metadata !{} turns into this: define @foo(i32 %v) { call void @llvm.foo(metadata i32 %v, metadata !0) call void @llvm.foo(metadata i32 7, metadata !0) call void @llvm.foo(metadata i32* @global, metadata !0) call void @llvm.foo(metadata !3, metadata !0) call void @llvm.foo(metadata !{!3}, metadata !0) ret void, !bar !2 } !0 = !{!2} !1 = !{i32* @global} !2 = !{!3} !3 = !{} I wrote an upgrade script that handled almost all of the tests in llvm and many of the tests in cfe (even handling many `CHECK` lines). I've attached it (or will attach it in a moment if you're speedy) to PR21532 to help everyone update their out-of-tree testcases. This is part of PR21532. llvm-svn: 224257 --- llvm/test/Analysis/BlockFrequencyInfo/bad_input.ll | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/test/Analysis/BlockFrequencyInfo/bad_input.ll') diff --git a/llvm/test/Analysis/BlockFrequencyInfo/bad_input.ll b/llvm/test/Analysis/BlockFrequencyInfo/bad_input.ll index bcdc1e6f0bc..da62dca67a8 100644 --- a/llvm/test/Analysis/BlockFrequencyInfo/bad_input.ll +++ b/llvm/test/Analysis/BlockFrequencyInfo/bad_input.ll @@ -23,7 +23,7 @@ for.end: ret void } -!0 = metadata !{metadata !"branch_weights", i32 0, i32 3} +!0 = !{!"branch_weights", i32 0, i32 3} ; CHECK-LABEL: Printing analysis {{.*}} for function 'infinite_loop' ; CHECK-NEXT: block-frequency-info: infinite_loop @@ -47,4 +47,4 @@ for.end: ret void } -!1 = metadata !{metadata !"branch_weights", i32 1, i32 1} +!1 = !{!"branch_weights", i32 1, i32 1} -- cgit v1.2.3