Skip to content

[+0-normal-args] Use ManagedValues instead of SILValues in PatternMat… #14639

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

Merged
merged 1 commit into from
Feb 14, 2018
Merged

[+0-normal-args] Use ManagedValues instead of SILValues in PatternMat… #14639

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
17 changes: 10 additions & 7 deletions lib/SILGen/SILGenPattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2460,7 +2460,9 @@ void PatternMatchEmission::emitSharedCaseBlocks() {

SILType ty = SGF.getLoweredType(V->getType());

SILValue value;
// Initialize mv at +1. We always pass values in at +1 for today into
// shared blocks.
ManagedValue mv;
if (ty.isAddressOnly(SGF.F.getModule())) {
// There's no basic block argument, since we don't allow basic blocks
// to have address arguments.
Expand All @@ -2473,21 +2475,22 @@ void PatternMatchEmission::emitSharedCaseBlocks() {
// been initialized on entry.
auto found = Temporaries.find(V);
assert(found != Temporaries.end());
value = found->second;
mv = SGF.emitManagedRValueWithCleanup(found->second);
} else {
value = caseBB->getArgument(argIndex++);
SILValue arg = caseBB->getArgument(argIndex++);
assert(arg.getOwnershipKind() == ValueOwnershipKind::Owned ||
arg.getOwnershipKind() == ValueOwnershipKind::Trivial);
mv = SGF.emitManagedRValueWithCleanup(arg);
}

if (V->isLet()) {
// Just emit a let with cleanup.
SGF.VarLocs[V].value = value;
SGF.enterDestroyCleanup(value);
// Just emit a let and leave the cleanup alone.
SGF.VarLocs[V].value = mv.getValue();
} else {
// The pattern variables were all emitted as lets and one got passed in,
// now we finally alloc a box for the var and forward in the chosen value.
SGF.VarLocs.erase(V);
auto newVar = SGF.emitInitializationForVarDecl(V, V->isLet());
auto mv = ManagedValue::forUnmanaged(value);
newVar->copyOrInitValueInto(SGF, V, mv, /*isInit*/ true);
newVar->finishInitialization(SGF);
}
Expand Down