mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-01 15:11:24 +00:00
387a89bb36
This reverts commit r233254, effectively reapplying r233164 (and its
successors), with an additional testcase for when subprograms match
exactly. This fixes PR22792 (again).
I'm using the same approach, but I've moved up the call to
`stripReplacedSubprograms()`. The function pointers need to be dropped
before mapping any metadata from the source module, or else this can
drop the function from new subprograms that have merged (via Metadata
uniquing) with the old ones. Dropping the pointers first prevents them
from merging.
**** The original commit message follows. ****
Linker: Drop function pointers for overridden subprograms
Instead of dropping subprograms that have been overridden, just set
their function pointers to `nullptr`. This is a minor adjustment to the
stop-gap fix for PR21910 committed in r224487, and fixes the crasher
from PR22792.
The problem that r224487 put a band-aid on: how do we find the canonical
subprogram for a `Function`? Since the backend currently relies on
`DebugInfoFinder` (which does a naive in-order traversal of compile
units and picks the first subprogram) for this, r224487 tried dropping
non-canonical subprograms.
Dropping subprograms fails because the backend *also* builds up a map
from subprogram to compile unit (`DwarfDebug::SPMap`) based on the
subprogram lists. A missing subprogram causes segfaults later when an
inlined reference (such as in this testcase) is created.
Instead, just drop the `Function` pointer to `nullptr`, which nicely
mirrors what happens when an already-inlined `Function` is optimized
out. We can't really be sure that it's the same definition anyway, as
the testcase demonstrates.
This still isn't completely satisfactory. Two flaws at least that I can
think of:
- I still haven't found a straightforward way to make this symmetric
in the IR. (Interestingly, the DWARF output is already symmetric,
and I've tested for that to be sure we don't regress.)
- Using `DebugInfoFinder` to find the canonical subprogram for a
function is kind of crazy. We should just attach metadata to the
function, like this:
define weak i32 @foo(i32, i32) !dbg !MDSubprogram(...) {
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233302 91177308-0d34-0410-b5e6-96231b3b80d8
80 lines
3.8 KiB
LLVM
80 lines
3.8 KiB
LLVM
; RUN: llvm-link %s %S/Inputs/replaced-function-matches-first-subprogram.ll -S | FileCheck %s
|
|
|
|
; Generated from C++ source:
|
|
;
|
|
; // repro/t.h
|
|
; template <class T> struct Class {
|
|
; int foo() { return 0; }
|
|
; };
|
|
; // repro/d1/t1.cpp
|
|
; #include "t.h"
|
|
; int foo() { return Class<int>().foo(); }
|
|
; // repro/d2/t2.cpp
|
|
; #include "t.h"
|
|
; template struct Class<int>;
|
|
|
|
%struct.Class = type { i8 }
|
|
|
|
define i32 @_Z3foov() {
|
|
entry:
|
|
%tmp = alloca %struct.Class, align 1
|
|
%call = call i32 @_ZN5ClassIiE3fooEv(%struct.Class* %tmp), !dbg !14
|
|
ret i32 %call, !dbg !14
|
|
}
|
|
|
|
; CHECK: define weak_odr i32 @_ZN5ClassIiE3fooEv(%struct.Class* %this){{.*}}{
|
|
; CHECK-NOT: }
|
|
; CHECK: !dbg ![[LOC:[0-9]+]]
|
|
define linkonce_odr i32 @_ZN5ClassIiE3fooEv(%struct.Class* %this) align 2 {
|
|
entry:
|
|
%this.addr = alloca %struct.Class*, align 8
|
|
store %struct.Class* %this, %struct.Class** %this.addr, align 8
|
|
%this1 = load %struct.Class*, %struct.Class** %this.addr
|
|
ret i32 0, !dbg !15
|
|
}
|
|
|
|
; CHECK: !llvm.dbg.cu = !{![[CU1:[0-9]+]], ![[CU2:[0-9]+]]}
|
|
!llvm.dbg.cu = !{!0}
|
|
!llvm.module.flags = !{!10, !11, !12}
|
|
!llvm.ident = !{!13}
|
|
|
|
; Extract out the list of subprograms from each compile unit.
|
|
; CHECK-DAG: ![[CU1]] = !MDCompileUnit({{.*}} subprograms: ![[SPs1:[0-9]+]]
|
|
; CHECK-DAG: ![[CU2]] = !MDCompileUnit({{.*}} subprograms: ![[SPs2:[0-9]+]]
|
|
!0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.6.0 (trunk 224193) (llvm/trunk 224197)", isOptimized: false, emissionKind: 2, file: !1, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2, imports: !2)
|
|
!1 = !MDFile(filename: "t1.cpp", directory: "/Users/dexonsmith/data/llvm/staging/test/Linker/repro/d1")
|
|
!2 = !{}
|
|
|
|
; Extract out each compile unit's single subprogram. The replaced subprogram's
|
|
; function should drop to null in the first compile unit.
|
|
; CHECK-DAG: ![[SPs1]] = !{![[SP1:[0-9]+]], ![[SP2r:[0-9]+]]}
|
|
; CHECK-DAG: ![[SPs2]] = !{![[SP2:[0-9]+]]}
|
|
!3 = !{!4, !7}
|
|
!4 = !MDSubprogram(name: "foo", line: 2, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !1, scope: !5, type: !6, function: i32 ()* @_Z3foov, variables: !2)
|
|
!5 = !MDFile(filename: "t1.cpp", directory: "/Users/dexonsmith/data/llvm/staging/test/Linker/repro/d1")
|
|
!6 = !MDSubroutineType(types: !2)
|
|
|
|
; Extract out the file from the replaced subprogram. Confirm that each
|
|
; subprogram is pointing at the correct function.
|
|
; CHECK-DAG: ![[SP1]] = !MDSubprogram({{.*}} function: i32 ()* @_Z3foov
|
|
; CHECK-DAG: ![[SP2]] = !MDSubprogram({{.*}} file: ![[FILE:[0-9]+]],{{.*}} function: i32 (%struct.Class*)* @_ZN5ClassIiE3fooEv
|
|
|
|
; We can't use CHECK-NOT/CHECK-SAME with a CHECK-DAG, so rely on field order to
|
|
; prove that there's no function: here.
|
|
; CHECK-DAG: ![[SP2r]] = {{.*}}!MDSubprogram({{.*}} isOptimized: false, variables:
|
|
!7 = !MDSubprogram(name: "foo", line: 2, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !8, scope: !9, type: !6, function: i32 (%struct.Class*)* @_ZN5ClassIiE3fooEv, variables: !2)
|
|
|
|
; The new subprogram should be pointing at the new directory.
|
|
; CHECK-DAG: ![[FILE]] = !MDFile(filename: "../t.h", directory: "/Users/dexonsmith/data/llvm/staging/test/Linker/repro/d2")
|
|
!8 = !MDFile(filename: "../t.h", directory: "/Users/dexonsmith/data/llvm/staging/test/Linker/repro/d1")
|
|
!9 = !MDFile(filename: "../t.h", directory: "/Users/dexonsmith/data/llvm/staging/test/Linker/repro/d1")
|
|
!10 = !{i32 2, !"Dwarf Version", i32 2}
|
|
!11 = !{i32 2, !"Debug Info Version", i32 3}
|
|
!12 = !{i32 1, !"PIC Level", i32 2}
|
|
!13 = !{!"clang version 3.6.0 (trunk 224193) (llvm/trunk 224197)"}
|
|
!14 = !MDLocation(line: 2, column: 20, scope: !4)
|
|
|
|
; The same subprogram should be pointed to by inside the !dbg reference.
|
|
; CHECK: ![[LOC]] = !MDLocation(line: 2, column: 15, scope: ![[SP2]])
|
|
!15 = !MDLocation(line: 2, column: 15, scope: !7)
|