Skip to content

[WIP][DNM]: try to fix hop to executor miscompile #86121

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

Draft
jamieQ wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −2
Draft

[WIP][DNM]: try to fix hop to executor miscompile #86121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
923ce5b
[WIP][DNM]: try to fix hop to executor miscompile
jamieQ Dec 18, 2025
55b64c7
try to fix block state mismatch
jamieQ Dec 19, 2025
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
27 changes: 25 additions & 2 deletions lib/SILOptimizer/Mandatory/OptimizeHopToExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,30 @@ void OptimizeHopToExecutor::solveDataflowBackward() {
} while (changed);
}

bool fixme_isCallerIsoInheriting(FullApplySite FAS) {
if (FAS.isCallerIsolationInheriting())
return true;

auto actorIsolation = FAS.getActorIsolation();
// llvm::dbgs() << "JQ: FAS actor iso:\n";
// actorIsolation->dump();
if (actorIsolation->getKind() == ActorIsolation::Unspecified) {
// FIXME: handle closures that inherit the caller's isolation correctly
auto calleSubsTy = FAS.getSubstCalleeType();
auto implicitIsoParam = calleSubsTy->maybeGetIsolatedParameter();
// llvm::dbgs() << "JQ: FAS imp iso param:\n";
// implicitIsoParam->dump();
return implicitIsoParam.has_value();
}

return false;
}

/// Returns true if \p inst is a suspension point or an async call.
static bool isSuspensionPoint(SILInstruction *inst) {
if (auto applySite = FullApplySite::isa(inst)) {
if (applySite.isAsync() && !applySite.isCallerIsolationInheriting())
// if (applySite.isAsync() && !applySite.isCallerIsolationInheriting())
if (applySite.isAsync() && !fixme_isCallerIsoInheriting(applySite))
return true;
return false;
}
Expand Down Expand Up @@ -392,7 +412,10 @@ bool OptimizeHopToExecutor::needsExecutor(SILInstruction *inst) {
// executors since caller isolation inheriting functions do not hop in their
// prologue.
if (auto fas = FullApplySite::isa(inst);
fas && fas.isAsync() && fas.isCallerIsolationInheriting()) {
fas && fas.isAsync() &&
fixme_isCallerIsoInheriting(fas)
// fas.isCallerIsolationInheriting()
) {
return true;
}

Expand Down