Skip to content

Commit a36b374

Browse files
committed
[region-isolation] Tweak the logging to make it easier to quickly find the emitted error when triaging code.
Just trying to improve my triaging speed by making it easier to triage.
1 parent 328e8af commit a36b374

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
@@ -1198,8 +1198,8 @@ void TransferNonSendableImpl::emitUseAfterTransferDiagnostics() {
11981198
if (transferOpToRequireInstMultiMap.empty())
11991199
return;
12001200

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

12041204
for (auto [transferOp, requireInsts] :
12051205
transferOpToRequireInstMultiMap.getRange()) {
@@ -1792,8 +1792,8 @@ void TransferNonSendableImpl::emitTransferredNonTransferrableDiagnostics() {
17921792
if (transferredNonTransferrableInfoList.empty())
17931793
return;
17941794

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

17981798
for (auto info : transferredNonTransferrableInfoList) {
17991799
TransferNonTransferrableDiagnosticInferrer diagnosticInferrer(info);
@@ -2195,7 +2195,7 @@ struct DiagnosticEvaluator final
21952195
auto rep = info->getValueMap().getRepresentative(transferredVal);
21962196
REGIONBASEDISOLATION_LOG(
21972197
llvm::dbgs()
2198-
<< " Emitting Use After Transfer Error!\n"
2198+
<< " Emitting Error. Kind: Use After Send\n"
21992199
<< " Transferring Inst: " << *transferringOp->getUser()
22002200
<< " Transferring Op Value: " << transferringOp->get()
22012201
<< " Require Inst: " << *partitionOp.getSourceInst()
@@ -2211,7 +2211,7 @@ struct DiagnosticEvaluator final
22112211
const PartitionOp &partitionOp, Element transferredVal,
22122212
SILDynamicMergedIsolationInfo isolationRegionInfo) const {
22132213
REGIONBASEDISOLATION_LOG(
2214-
llvm::dbgs() << " Emitting TransferNonTransferrable Error!\n"
2214+
llvm::dbgs() << " Emitting Error. Kind: Send Non Sendable\n"
22152215
<< " ID: %%" << transferredVal << "\n"
22162216
<< " Rep: "
22172217
<< *info->getValueMap().getRepresentative(transferredVal)
@@ -2223,10 +2223,7 @@ struct DiagnosticEvaluator final
22232223
auto name = inferNameHelper(isolatedValue);
22242224
llvm::dbgs() << " Isolated Value Name: "
22252225
<< (name.has_value() ? name->get() : "none") << '\n';
2226-
} else {
2227-
llvm::dbgs() << " Isolated Value: none\n";
2228-
}
2229-
);
2226+
} else { llvm::dbgs() << " Isolated Value: none\n"; });
22302227
auto *self = const_cast<DiagnosticEvaluator *>(this);
22312228
auto nonTransferrableValue =
22322229
info->getValueMap().getRepresentative(transferredVal);
@@ -2239,7 +2236,8 @@ struct DiagnosticEvaluator final
22392236
const PartitionOp &partitionOp, Element inoutSendingVal,
22402237
SILDynamicMergedIsolationInfo isolationRegionInfo) const {
22412238
REGIONBASEDISOLATION_LOG(
2242-
llvm::dbgs() << " Emitting InOut Sending ActorIsolated at end of "
2239+
llvm::dbgs() << " Emitting Error. Kind: InOut Sending ActorIsolated "
2240+
"at end of "
22432241
"Function Error!\n"
22442242
<< " ID: %%" << inoutSendingVal << "\n"
22452243
<< " Rep: "
@@ -2261,7 +2259,7 @@ struct DiagnosticEvaluator final
22612259
Element actualNonTransferrableValue,
22622260
SILDynamicMergedIsolationInfo isolationRegionInfo) const {
22632261
REGIONBASEDISOLATION_LOG(
2264-
llvm::dbgs() << " Emitting TransferNonTransferrable Error!\n"
2262+
llvm::dbgs() << " Emitting Error. Kind: Send Non Sendable\n"
22652263
<< " ID: %%" << transferredVal << "\n"
22662264
<< " Rep: "
22672265
<< *info->getValueMap().getRepresentative(transferredVal)
@@ -2306,7 +2304,7 @@ struct DiagnosticEvaluator final
23062304
auto srcRep = info->getValueMap().getRepresentativeValue(srcElement);
23072305
REGIONBASEDISOLATION_LOG(
23082306
llvm::dbgs()
2309-
<< " Emitting Error! Kind: Assign Isolated Into Sending Result!\n"
2307+
<< " Emitting Error. Kind: Assign Isolated Into Sending Result!\n"
23102308
<< " Assign Inst: " << *partitionOp.getSourceInst()
23112309
<< " Dest Value: " << *destValue
23122310
<< " Dest Element: " << destElement << '\n'
@@ -2325,7 +2323,8 @@ struct DiagnosticEvaluator final
23252323
auto rep = info->getValueMap().getRepresentative(inoutSendingVal);
23262324
REGIONBASEDISOLATION_LOG(
23272325
llvm::dbgs()
2328-
<< " Emitting InOut Not Reinitialized At End Of Function!\n"
2326+
<< " Emitting Error. Kind: InOut Not Reinitialized At End Of "
2327+
"Function\n"
23292328
<< " Transferring Inst: " << *transferringOp->getUser()
23302329
<< " Transferring Op Value: " << transferringOp->get()
23312330
<< " Require Inst: " << *partitionOp.getSourceInst()

0 commit comments

Comments
 (0)