Skip to content

Commit c6b7b1f

Browse files
aschwaighoferaschwaighofer
authored
Merge pull request swiftlang#82110 from tobias-stadler/remarks-fix-mangled-functionnames
[SIL] RemarkStreamer: Use mangled function names
2 parents 439bd97 + 9dc88c4 commit c6b7b1f

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

‎include/swift/SIL/SILRemarkStreamer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ llvm::remarks::Remark SILRemarkStreamer::toLLVMRemark(
107107
llvmRemark.RemarkType = toRemarkType<RemarkT>();
108108
llvmRemark.PassName = optRemark.getPassName();
109109
llvmRemark.RemarkName = optRemark.getIdentifier();
110-
llvmRemark.FunctionName = optRemark.getDemangledFunctionName();
110+
llvmRemark.FunctionName = optRemark.getFunction()->getName();
111111
llvmRemark.Loc =
112112
toRemarkLocation(optRemark.getLocation(), getASTContext().SourceMgr);
113113

‎test/Driver/opt-record.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public func bar() {
2727
// YAML: File: {{.*}}opt-record.swift
2828
// YAML: Line: [[@LINE-6]]
2929
// YAML: Column: 3
30-
// YAML-NEXT: Function: 'bar()'
30+
// YAML-NEXT: Function: '$s12optrecordmod3baryyF'
3131
// YAML-NEXT: Args:
3232
// YAML-NEXT: - Callee: '"optrecordmod.foo()"'
3333
// YAML-NEXT: DebugLoc:

‎test/SILOptimizer/assemblyvision_remark/basic_yaml.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swiftc_driver -O -Rpass-missed=sil-assembly-vision-remark-gen -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xfrontend -enable-copy-propagation -emit-sil %s -o /dev/null -Xfrontend -verify
22

33
// RUN: %empty-directory(%t)
4-
// RUN: %target-swiftc_driver -wmo -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xfrontend -enable-copy-propagation -emit-sil -save-optimization-record=yaml -save-optimization-record-path %t/note.yaml %s -o /dev/null && %FileCheck --input-file=%t/note.yaml %s
4+
// RUN: %target-swiftc_driver -wmo -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xfrontend -enable-copy-propagation -emit-sil -save-optimization-record=yaml -save-optimization-record-path %t/note.yaml -module-name optrecordmod %s -o /dev/null && %FileCheck --input-file=%t/note.yaml %s
55

66
// REQUIRES: optimized_stdlib,swift_stdlib_no_asserts
77
// REQUIRES: swift_in_compiler
@@ -30,7 +30,7 @@ public var global = Klass() // expected-remark {{heap allocated ref of type 'Kla
3030
// CHECK-NEXT: Name: sil.memory
3131
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
3232
// CHECK-NEXT: Line: [[# @LINE + 42 ]], Column: 12 }
33-
// CHECK-NEXT: Function: 'getGlobal()'
33+
// CHECK-NEXT: Function: '$s12optrecordmod9getGlobalAA5KlassCyF'
3434
// CHECK-NEXT: Args:
3535
// CHECK-NEXT: - String: 'begin exclusive access to value of type '''
3636
// CHECK-NEXT: - ValueType: Klass
@@ -45,7 +45,7 @@ public var global = Klass() // expected-remark {{heap allocated ref of type 'Kla
4545
// CHECK-NEXT: Name: sil.memory
4646
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
4747
// CHECK-NEXT: Line: [[# @LINE + 27 ]], Column: 12 }
48-
// CHECK-NEXT: Function: 'getGlobal()'
48+
// CHECK-NEXT: Function: '$s12optrecordmod9getGlobalAA5KlassCyF'
4949
// CHECK-NEXT: Args:
5050
// CHECK-NEXT: - String: 'end exclusive access to value of type '''
5151
// CHECK-NEXT: - ValueType: Klass
@@ -60,7 +60,7 @@ public var global = Klass() // expected-remark {{heap allocated ref of type 'Kla
6060
// CHECK-NEXT: Name: sil.memory
6161
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
6262
// CHECK-NEXT: Line: [[# @LINE + 12]], Column: 5 }
63-
// CHECK-NEXT: Function: 'getGlobal()'
63+
// CHECK-NEXT: Function: '$s12optrecordmod9getGlobalAA5KlassCyF'
6464
// CHECK-NEXT: Args:
6565
// CHECK-NEXT: - String: 'retain of type '''
6666
// CHECK-NEXT: - ValueType: Klass
@@ -85,7 +85,7 @@ public func getGlobal() -> Klass {
8585
// CHECK-NEXT: Name: sil.memory
8686
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
8787
// CHECK-NEXT: Line: [[# @LINE + 51 ]], Column: 11 }
88-
// CHECK-NEXT: Function: 'useGlobal()'
88+
// CHECK-NEXT: Function: '$s12optrecordmod9useGlobalyyF'
8989
// CHECK-NEXT: Args:
9090
// CHECK-NEXT: - String: 'heap allocated ref of type '''
9191
// CHECK-NEXT: - ValueType:
@@ -96,7 +96,7 @@ public func getGlobal() -> Klass {
9696
// CHECK-NEXT: Name: sil.memory
9797
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
9898
// CHECK-NEXT: Line: [[# @LINE + 40 ]], Column: 5 }
99-
// CHECK-NEXT: Function: 'useGlobal()'
99+
// CHECK-NEXT: Function: '$s12optrecordmod9useGlobalyyF'
100100
// CHECK-NEXT: Args:
101101
// CHECK-NEXT: - String: 'retain of type '''
102102
// CHECK-NEXT: - ValueType: Klass
@@ -110,7 +110,7 @@ public func getGlobal() -> Klass {
110110
// CHECK-NEXT: Name: sil.memory
111111
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
112112
// CHECK-NEXT: Line: [[# @LINE + 26 ]], Column: 12 }
113-
// CHECK-NEXT: Function: 'useGlobal()'
113+
// CHECK-NEXT: Function: '$s12optrecordmod9useGlobalyyF'
114114
// CHECK-NEXT: Args:
115115
// CHECK-NEXT: - String: 'release of type '''
116116
// CHECK-NEXT: - ValueType:
@@ -121,7 +121,7 @@ public func getGlobal() -> Klass {
121121
// CHECK-NEXT: Name: sil.memory
122122
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
123123
// CHECK-NEXT: Line: [[# @LINE + 15 ]], Column: 12 }
124-
// CHECK-NEXT: Function: 'useGlobal()'
124+
// CHECK-NEXT: Function: '$s12optrecordmod9useGlobalyyF'
125125
// CHECK-NEXT: Args:
126126
// CHECK-NEXT: - String: 'release of type '''
127127
// CHECK-NEXT: - ValueType: Klass

‎test/SILOptimizer/devirt_speculate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class Sub7 : Base {
101101
// YAML: File: {{.*}}/devirt_speculate.swift
102102
// YAML: Line: 118
103103
// YAML: Column: 5
104-
// YAML-NEXT: Function: 'testMaxNumSpeculativeTargets(_:)'
104+
// YAML-NEXT: Function: '$s16devirt_speculate28testMaxNumSpeculativeTargetsyyAA4BaseCF'
105105
// YAML-NEXT: Args:
106106
// YAML-NEXT: - String: 'Partially devirtualized call with run-time checks for '
107107
// YAML-NEXT: - NumSubTypesChecked: '6'

‎test/SILOptimizer/devirtualize.sil‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ bb0(%0 : $@thick C.Type):
137137
// YAML: File: {{.*}}/devirtualize.sil
138138
// YAML: Line: 127
139139
// YAML: Column: 8
140-
// YAML-NEXT: Function: 'caller(_:)'
140+
// YAML-NEXT: Function: _TF4metaP33_7026FC13D35FB9700BACF693F51A99016callerFMCS_P33_7026FC13D35FB9700BACF693F51A99011CT_
141141
// YAML-NEXT: Args:
142142
// YAML-NEXT: - String: 'Devirtualized call to class method '
143143
// YAML-NEXT: - Method: '"static meta.B.foo(_:)"'

‎test/SILOptimizer/devirtualize_ownership.sil‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ bb0(%0 : $@thick C.Type):
138138
// YAML: File: {{.*}}/devirtualize_ownership.sil
139139
// YAML: Line: 128
140140
// YAML: Column: 8
141-
// YAML-NEXT: Function: 'caller(_:)'
141+
// YAML-NEXT: Function: _TF4metaP33_7026FC13D35FB9700BACF693F51A99016callerFMCS_P33_7026FC13D35FB9700BACF693F51A99011CT_
142142
// YAML-NEXT: Args:
143143
// YAML-NEXT: - String: 'Devirtualized call to class method '
144144
// YAML-NEXT: - Method: '"static meta.B.foo(_:)"'

0 commit comments

Comments
 (0)