Skip to content

Commit 083b10a

Browse files
authored
Merge pull request swiftlang#75963 from gottesmm/pr-fb279661a394bc36c6aea28f928d0c7e3adfdea4
[region-isolation] Tweak the logging to make it easier to quickly find the emitted error when triaging code.
2 parents 582144a + a36b374 commit 083b10a

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,8 +1253,8 @@ void TransferNonSendableImpl::emitUseAfterTransferDiagnostics() {
12531253
if (transferOpToRequireInstMultiMap.empty())
12541254
return;
12551255

1256-
REGIONBASEDISOLATION_LOG(llvm::dbgs()
1257-
<< "Emitting use after transfer diagnostics.\n");
1256+
REGIONBASEDISOLATION_LOG(
1257+
llvm::dbgs() << "Emitting Error. Kind: Use After Send diagnostics.\n");
12581258

12591259
for (auto [transferOp, requireInsts] :
12601260
transferOpToRequireInstMultiMap.getRange()) {
@@ -2030,8 +2030,8 @@ void TransferNonSendableImpl::emitTransferredNonTransferrableDiagnostics() {
20302030
if (transferredNonTransferrableInfoList.empty())
20312031
return;
20322032

2033-
REGIONBASEDISOLATION_LOG(
2034-
llvm::dbgs() << "Emitting transfer non transferrable diagnostics.\n");
2033+
REGIONBASEDISOLATION_LOG(llvm::dbgs()
2034+
<< "Emitting Error. Kind: Send Never Sendable.\n");
20352035

20362036
for (auto info : transferredNonTransferrableInfoList) {
20372037
TransferNonTransferrableDiagnosticInferrer diagnosticInferrer(
@@ -2434,7 +2434,7 @@ struct DiagnosticEvaluator final
24342434
auto rep = info->getValueMap().getRepresentative(transferredVal);
24352435
REGIONBASEDISOLATION_LOG(
24362436
llvm::dbgs()
2437-
<< " Emitting Use After Transfer Error!\n"
2437+
<< " Emitting Error. Kind: Use After Send\n"
24382438
<< " Transferring Inst: " << *transferringOp->getUser()
24392439
<< " Transferring Op Value: " << transferringOp->get()
24402440
<< " Require Inst: " << *partitionOp.getSourceInst()
@@ -2450,7 +2450,7 @@ struct DiagnosticEvaluator final
24502450
const PartitionOp &partitionOp, Element transferredVal,
24512451
SILDynamicMergedIsolationInfo isolationRegionInfo) const {
24522452
REGIONBASEDISOLATION_LOG(
2453-
llvm::dbgs() << " Emitting TransferNonTransferrable Error!\n"
2453+
llvm::dbgs() << " Emitting Error. Kind: Send Non Sendable\n"
24542454
<< " ID: %%" << transferredVal << "\n"
24552455
<< " Rep: "
24562456
<< *info->getValueMap().getRepresentative(transferredVal)
@@ -2462,10 +2462,7 @@ struct DiagnosticEvaluator final
24622462
auto name = inferNameHelper(isolatedValue);
24632463
llvm::dbgs() << " Isolated Value Name: "
24642464
<< (name.has_value() ? name->get() : "none") << '\n';
2465-
} else {
2466-
llvm::dbgs() << " Isolated Value: none\n";
2467-
}
2468-
);
2465+
} else { llvm::dbgs() << " Isolated Value: none\n"; });
24692466
auto *self = const_cast<DiagnosticEvaluator *>(this);
24702467
auto nonTransferrableValue =
24712468
info->getValueMap().getRepresentative(transferredVal);
@@ -2478,7 +2475,8 @@ struct DiagnosticEvaluator final
24782475
const PartitionOp &partitionOp, Element inoutSendingVal,
24792476
SILDynamicMergedIsolationInfo isolationRegionInfo) const {
24802477
REGIONBASEDISOLATION_LOG(
2481-
llvm::dbgs() << " Emitting InOut Sending ActorIsolated at end of "
2478+
llvm::dbgs() << " Emitting Error. Kind: InOut Sending ActorIsolated "
2479+
"at end of "
24822480
"Function Error!\n"
24832481
<< " ID: %%" << inoutSendingVal << "\n"
24842482
<< " Rep: "
@@ -2500,7 +2498,7 @@ struct DiagnosticEvaluator final
25002498
Element actualNonTransferrableValue,
25012499
SILDynamicMergedIsolationInfo isolationRegionInfo) const {
25022500
REGIONBASEDISOLATION_LOG(
2503-
llvm::dbgs() << " Emitting TransferNonTransferrable Error!\n"
2501+
llvm::dbgs() << " Emitting Error. Kind: Send Non Sendable\n"
25042502
<< " ID: %%" << transferredVal << "\n"
25052503
<< " Rep: "
25062504
<< *info->getValueMap().getRepresentative(transferredVal)
@@ -2545,7 +2543,7 @@ struct DiagnosticEvaluator final
25452543
auto srcRep = info->getValueMap().getRepresentativeValue(srcElement);
25462544
REGIONBASEDISOLATION_LOG(
25472545
llvm::dbgs()
2548-
<< " Emitting Error! Kind: Assign Isolated Into Sending Result!\n"
2546+
<< " Emitting Error. Kind: Assign Isolated Into Sending Result!\n"
25492547
<< " Assign Inst: " << *partitionOp.getSourceInst()
25502548
<< " Dest Value: " << *destValue
25512549
<< " Dest Element: " << destElement << '\n'
@@ -2564,7 +2562,8 @@ struct DiagnosticEvaluator final
25642562
auto rep = info->getValueMap().getRepresentative(inoutSendingVal);
25652563
REGIONBASEDISOLATION_LOG(
25662564
llvm::dbgs()
2567-
<< " Emitting InOut Not Reinitialized At End Of Function!\n"
2565+
<< " Emitting Error. Kind: InOut Not Reinitialized At End Of "
2566+
"Function\n"
25682567
<< " Transferring Inst: " << *transferringOp->getUser()
25692568
<< " Transferring Op Value: " << transferringOp->get()
25702569
<< " Require Inst: " << *partitionOp.getSourceInst()

0 commit comments

Comments
 (0)