mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-26 04:32:44 +01:00
9c5542c040
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
118 lines
5.5 KiB
LLVM
118 lines
5.5 KiB
LLVM
; REQUIRES: object-emission
|
|
|
|
; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s
|
|
|
|
; Built with clang from the following source:
|
|
; void f1(int);
|
|
; __attribute__((always_inline)) inline void f2(int i) { f1(i); }
|
|
;
|
|
; #define MULTICALL \
|
|
; f2(x); \
|
|
; f2(y);
|
|
;
|
|
; void f3(int x, int y) { MULTICALL; }
|
|
|
|
; FIXME: This produces only one inlined_subroutine, with two formal_parameters
|
|
; (both named "this"), one for each of the actual inlined subroutines. ;
|
|
; Inlined scopes are differentiated by the combination of 'inlined at' (call)
|
|
; location and the location within the function. If two calls to the same
|
|
; function occur at the same location the scopes end up conflated and there
|
|
; appears to be only one inlined function.
|
|
; To fix this, we'd need to add some kind of unique metadata per call site, possibly something like:
|
|
;
|
|
; !42 = !{i32 1, i32 0, !43, !44}
|
|
; !44 = !{i32 2, i32 0, !45, null}
|
|
;
|
|
; ->
|
|
;
|
|
; !42 = !{i32 1, i32 0, !43, !44}
|
|
; !44 = !{!45, !44}
|
|
; !45 = !{i32 2, i32 0, !45, null}
|
|
;
|
|
; since cycles in metadata are not uniqued, the !44 node would not be shared
|
|
; between calls to the same function from the same location, ensuring separate
|
|
; inlined subroutines would be generated.
|
|
;
|
|
; Once this is done, the (insufficient) hack in clang that adds column
|
|
; information to call sites to differentiate inlined callers can be removed as it
|
|
; will no longer be necessary.
|
|
;
|
|
; While it might be nice to omit the duplicate parameter in this case (while
|
|
; we wait/work on the real fix), it's actually better to leave it in because it
|
|
; allows us to hold the invariant that every DbgVariable has a DIE, every time.
|
|
; This has proved valuable in finding other bugs, so I want to avoid removing the
|
|
; invariant/assertion. Besides, we don't know which one's the right one anyway...
|
|
|
|
; CHECK: DW_TAG_subprogram
|
|
; CHECK: DW_TAG_inlined_subroutine
|
|
; CHECK: DW_TAG_formal_parameter
|
|
; CHECK-NOT: DW_TAG
|
|
; CHECK: DW_TAG_formal_parameter
|
|
; CHECK-NOT: DW_TAG
|
|
; CHECK: NULL
|
|
; CHECK-NOT: DW_TAG
|
|
; CHECK: NULL
|
|
|
|
; Function Attrs: uwtable
|
|
define void @_Z2f3ii(i32 %x, i32 %y) #0 {
|
|
entry:
|
|
%i.addr.i1 = alloca i32, align 4
|
|
%i.addr.i = alloca i32, align 4
|
|
%x.addr = alloca i32, align 4
|
|
%y.addr = alloca i32, align 4
|
|
store i32 %x, i32* %x.addr, align 4
|
|
call void @llvm.dbg.declare(metadata i32* %x.addr, metadata !15, metadata !16), !dbg !17
|
|
store i32 %y, i32* %y.addr, align 4
|
|
call void @llvm.dbg.declare(metadata i32* %y.addr, metadata !18, metadata !16), !dbg !19
|
|
%0 = load i32* %x.addr, align 4, !dbg !20
|
|
store i32 %0, i32* %i.addr.i, align 4, !dbg !20
|
|
call void @llvm.dbg.declare(metadata i32* %i.addr.i, metadata !21, metadata !16), !dbg !22
|
|
%1 = load i32* %i.addr.i, align 4, !dbg !23
|
|
call void @_Z2f1i(i32 %1), !dbg !23
|
|
%2 = load i32* %y.addr, align 4, !dbg !20
|
|
store i32 %2, i32* %i.addr.i1, align 4, !dbg !20
|
|
call void @llvm.dbg.declare(metadata i32* %i.addr.i1, metadata !21, metadata !16), !dbg !22
|
|
%3 = load i32* %i.addr.i1, align 4, !dbg !23
|
|
call void @_Z2f1i(i32 %3), !dbg !23
|
|
ret void, !dbg !24
|
|
}
|
|
|
|
; Function Attrs: nounwind readnone
|
|
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
|
|
|
|
declare void @_Z2f1i(i32) #2
|
|
|
|
attributes #0 = { uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
|
|
attributes #1 = { nounwind readnone }
|
|
attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
|
|
|
|
!llvm.dbg.cu = !{!0}
|
|
!llvm.module.flags = !{!12, !13}
|
|
!llvm.ident = !{!14}
|
|
|
|
!0 = !{!"0x11\004\00clang version 3.6.0 \000\00\000\00\001", !1, !2, !2, !3, !2, !2} ; [ DW_TAG_compile_unit ] [/tmp/dbginfo/duplicate_inline.cpp] [DW_LANG_C_plus_plus]
|
|
!1 = !{!"duplicate_inline.cpp", !"/tmp/dbginfo"}
|
|
!2 = !{}
|
|
!3 = !{!4, !9}
|
|
!4 = !{!"0x2e\00f3\00f3\00_Z2f3ii\008\000\001\000\000\00256\000\008", !1, !5, !6, null, void (i32, i32)* @_Z2f3ii, null, null, !2} ; [ DW_TAG_subprogram ] [line 8] [def] [f3]
|
|
!5 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [/tmp/dbginfo/duplicate_inline.cpp]
|
|
!6 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
|
|
!7 = !{null, !8, !8}
|
|
!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]
|
|
!9 = !{!"0x2e\00f2\00f2\00_Z2f2i\002\000\001\000\000\00256\000\002", !1, !5, !10, null, null, null, null, !2} ; [ DW_TAG_subprogram ] [line 2] [def] [f2]
|
|
!10 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !11, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
|
|
!11 = !{null, !8}
|
|
!12 = !{i32 2, !"Dwarf Version", i32 4}
|
|
!13 = !{i32 2, !"Debug Info Version", i32 2}
|
|
!14 = !{!"clang version 3.6.0 "}
|
|
!15 = !{!"0x101\00x\0016777224\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [x] [line 8]
|
|
!16 = !{!"0x102"} ; [ DW_TAG_expression ]
|
|
!17 = !{i32 8, i32 13, !4, null}
|
|
!18 = !{!"0x101\00y\0033554440\000", !4, !5, !8} ; [ DW_TAG_arg_variable ] [y] [line 8]
|
|
!19 = !{i32 8, i32 20, !4, null}
|
|
!20 = !{i32 8, i32 25, !4, null}
|
|
!21 = !{!"0x101\00i\0016777218\000", !9, !5, !8} ; [ DW_TAG_arg_variable ] [i] [line 2]
|
|
!22 = !{i32 2, i32 51, !9, !20}
|
|
!23 = !{i32 2, i32 56, !9, !20}
|
|
!24 = !{i32 8, i32 36, !4, null}
|