Skip to content

[cxx-interop][SwiftCompilerSources] Use BridgedStringRef once again to prevent crash #59420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
egorzhdan wants to merge 1 commit into from
Closed

[cxx-interop][SwiftCompilerSources] Use BridgedStringRef once again to prevent crash #59420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SwiftCompilerSources/Sources/SIL/BasicBlock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final public class BasicBlock : ListNode, CustomStringConvertible, HasShortDescr
public var function: Function { SILBasicBlock_getFunction(bridged).function }

public var description: String {
String(_cxxString: SILBasicBlock_debugDescription(bridged))
SILBasicBlock_debugDescription(bridged).takeString()
}
public var shortDescription: String { name }

Expand Down
2 changes: 1 addition & 1 deletion include/swift/SIL/SILBridging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ std::string SILGlobalVariable_debugDescription(BridgedGlobalVar global);
OptionalBridgedBasicBlock SILBasicBlock_next(BridgedBasicBlock block);
OptionalBridgedBasicBlock SILBasicBlock_previous(BridgedBasicBlock block);
BridgedFunction SILBasicBlock_getFunction(BridgedBasicBlock block);
std::string SILBasicBlock_debugDescription(BridgedBasicBlock block);
BridgedStringRef SILBasicBlock_debugDescription(BridgedBasicBlock block);
OptionalBridgedInstruction SILBasicBlock_firstInst(BridgedBasicBlock block);
OptionalBridgedInstruction SILBasicBlock_lastInst(BridgedBasicBlock block);
SwiftInt SILBasicBlock_getNumArguments(BridgedBasicBlock block);
Expand Down
5 changes: 2 additions & 3 deletions lib/SIL/Utils/SILBridging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,11 @@ BridgedFunction SILBasicBlock_getFunction(BridgedBasicBlock block) {
return {castToBasicBlock(block)->getParent()};
}

std::string SILBasicBlock_debugDescription(BridgedBasicBlock block) {
BridgedStringRef SILBasicBlock_debugDescription(BridgedBasicBlock block) {
std::string str;
llvm::raw_string_ostream os(str);
castToBasicBlock(block)->print(os);
str.pop_back(); // Remove trailing newline.
return str;
return getCopiedBridgedStringRef(str, /*removeTrailingNewline*/ true);
}

OptionalBridgedInstruction SILBasicBlock_firstInst(BridgedBasicBlock block) {
Expand Down
3 changes: 0 additions & 3 deletions test/SILOptimizer/addr_escape_info.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

// REQUIRES: swift_in_compiler

// rdar92963081
// UNSUPPORTED: OS=linux-gnu

sil_stage canonical

import Builtin
Expand Down
3 changes: 0 additions & 3 deletions test/SILOptimizer/escape_info.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

// REQUIRES: swift_in_compiler

// rdar92963081
// UNSUPPORTED: OS=linux-gnu

sil_stage canonical

import Builtin
Expand Down
3 changes: 0 additions & 3 deletions test/SILOptimizer/ranges.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

// REQUIRES: swift_in_compiler

// rdar92963081
// UNSUPPORTED: OS=linux-gnu

sil_stage canonical

// CHECK-LABEL: Instruction range in basic_test:
Expand Down