averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SIL] RemarkStreamer: Use mangled function names

Browse Source 
Remarks emitted by LLVM use the mangled function name. Be consistent
with LLVM when serializing SIL remarks, so external tools can properly
filter for all remarks attributed to a certain function.
This commit is contained in:
Tobias Stadler
2025-06-06 14:58:05 +01:00
parent 9259c3eec4
commit 4b0c0001bc
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/SIL/SILRemarkStreamer.h
View File

@@ -107,7 +107,7 @@ llvm::remarks::Remark SILRemarkStreamer::toLLVMRemark(
llvmRemark.RemarkType = toRemarkType<RemarkT>();
llvmRemark.PassName = optRemark.getPassName();
llvmRemark.RemarkName = optRemark.getIdentifier();
llvmRemark.FunctionName = optRemark.getDemangledFunctionName();
llvmRemark.FunctionName = optRemark.getFunction()->getName();
llvmRemark.Loc =
toRemarkLocation(optRemark.getLocation(), getASTContext().SourceMgr);

2
test/Driver/opt-record.swift
View File

@@ -27,7 +27,7 @@ public func bar() {
// YAML: File: {{.*}}opt-record.swift
// YAML: Line: [[@LINE-6]]
// YAML: Column: 3
// YAML-NEXT: Function: 'bar()'
// YAML-NEXT: Function: '$s12optrecordmod3baryyF'
// YAML-NEXT: Args:
// YAML-NEXT: - Callee: '"optrecordmod.foo()"'
// YAML-NEXT: DebugLoc:

14
test/SILOptimizer/assemblyvision_remark/basic_yaml.swift
View File

@@ -30,7 +30,7 @@ public var global = Klass() // expected-remark {{heap allocated ref of type 'Kla
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 42 ]], Column: 12 }
// CHECK-NEXT: Function: 'getGlobal()'
// CHECK-NEXT: Function: '$s4null9getGlobalAA5KlassCyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'begin exclusive access to value of type '''
// CHECK-NEXT: - ValueType: Klass
@@ -45,7 +45,7 @@ public var global = Klass() // expected-remark {{heap allocated ref of type 'Kla
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 27 ]], Column: 12 }
// CHECK-NEXT: Function: 'getGlobal()'
// CHECK-NEXT: Function: '$s4null9getGlobalAA5KlassCyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'end exclusive access to value of type '''
// CHECK-NEXT: - ValueType: Klass
@@ -60,7 +60,7 @@ public var global = Klass() // expected-remark {{heap allocated ref of type 'Kla
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 12]], Column: 5 }
// CHECK-NEXT: Function: 'getGlobal()'
// CHECK-NEXT: Function: '$s4null9getGlobalAA5KlassCyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'retain of type '''
// CHECK-NEXT: - ValueType: Klass
@@ -85,7 +85,7 @@ public func getGlobal() -> Klass {
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 51 ]], Column: 11 }
// CHECK-NEXT: Function: 'useGlobal()'
// CHECK-NEXT: Function: '$s4null9useGlobalyyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'heap allocated ref of type '''
// CHECK-NEXT: - ValueType:
@@ -96,7 +96,7 @@ public func getGlobal() -> Klass {
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 40 ]], Column: 5 }
// CHECK-NEXT: Function: 'useGlobal()'
// CHECK-NEXT: Function: '$s4null9useGlobalyyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'retain of type '''
// CHECK-NEXT: - ValueType: Klass
@@ -110,7 +110,7 @@ public func getGlobal() -> Klass {
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 26 ]], Column: 12 }
// CHECK-NEXT: Function: 'useGlobal()'
// CHECK-NEXT: Function: '$s4null9useGlobalyyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'release of type '''
// CHECK-NEXT: - ValueType:
@@ -121,7 +121,7 @@ public func getGlobal() -> Klass {
// CHECK-NEXT: Name: sil.memory
// CHECK-NEXT: DebugLoc: { File: '{{.*}}basic_yaml.swift',
// CHECK-NEXT: Line: [[# @LINE + 15 ]], Column: 12 }
// CHECK-NEXT: Function: 'useGlobal()'
// CHECK-NEXT: Function: '$s4null9useGlobalyyF'
// CHECK-NEXT: Args:
// CHECK-NEXT: - String: 'release of type '''
// CHECK-NEXT: - ValueType: Klass

2
test/SILOptimizer/devirt_speculate.swift
View File

@@ -101,7 +101,7 @@ class Sub7 : Base {
// YAML: File: {{.*}}/devirt_speculate.swift
// YAML: Line: 118
// YAML: Column: 5
// YAML-NEXT: Function: 'testMaxNumSpeculativeTargets(_:)'
// YAML-NEXT: Function: '$s16devirt_speculate28testMaxNumSpeculativeTargetsyyAA4BaseCF'
// YAML-NEXT: Args:
// YAML-NEXT: - String: 'Partially devirtualized call with run-time checks for '
// YAML-NEXT: - NumSubTypesChecked: '6'

2
test/SILOptimizer/devirtualize.sil
View File

@@ -137,7 +137,7 @@ bb0(%0 : $@thick C.Type):
// YAML: File: {{.*}}/devirtualize.sil
// YAML: Line: 127
// YAML: Column: 8
// YAML-NEXT: Function: 'caller(_:)'
// YAML-NEXT: Function: _TF4metaP33_7026FC13D35FB9700BACF693F51A99016callerFMCS_P33_7026FC13D35FB9700BACF693F51A99011CT_
// YAML-NEXT: Args:
// YAML-NEXT: - String: 'Devirtualized call to class method '
// YAML-NEXT: - Method: '"static meta.B.foo(_:)"'

2
test/SILOptimizer/devirtualize_ownership.sil
View File

@@ -138,7 +138,7 @@ bb0(%0 : $@thick C.Type):
// YAML: File: {{.*}}/devirtualize_ownership.sil
// YAML: Line: 128
// YAML: Column: 8
// YAML-NEXT: Function: 'caller(_:)'
// YAML-NEXT: Function: _TF4metaP33_7026FC13D35FB9700BACF693F51A99016callerFMCS_P33_7026FC13D35FB9700BACF693F51A99011CT_
// YAML-NEXT: Args:
// YAML-NEXT: - String: 'Devirtualized call to class method '
// YAML-NEXT: - Method: '"static meta.B.foo(_:)"'