Skip to content

[silgen] Instead of creating a single CleanupCloner for an RValue, use a helper routine that stores into an outarray a cloner for each ManagedValue in the RValue. #31517

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
May 3, 2020
Merged

[silgen] Instead of creating a single CleanupCloner for an RValue, use a helper routine that stores into an outarray a cloner for each ManagedValue in the RValue. #31517

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
16 changes: 12 additions & 4 deletions lib/SILGen/Cleanup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,19 @@ CleanupCloner::CleanupCloner(SILGenFunction &SGF, const ManagedValue &mv)
CleanupCloner::CleanupCloner(SILGenBuilder &builder, const ManagedValue &mv)
: CleanupCloner(builder.getSILGenFunction(), mv) {}

CleanupCloner::CleanupCloner(SILGenFunction &SGF, const RValue &rv)
: SGF(SGF), hasCleanup(rv.isPlusOne(SGF)), isLValue(false) {}
void CleanupCloner::getClonersForRValue(
SILGenBuilder &builder, const RValue &rvalue,
SmallVectorImpl<CleanupCloner> &resultingCloners) {
return getClonersForRValue(builder.getSILGenFunction(), rvalue,
resultingCloners);
}

CleanupCloner::CleanupCloner(SILGenBuilder &builder, const RValue &rv)
: CleanupCloner(builder.getSILGenFunction(), rv) {}
void CleanupCloner::getClonersForRValue(
SILGenFunction &SGF, const RValue &rvalue,
SmallVectorImpl<CleanupCloner> &resultingCloners) {
transform(rvalue.values, std::back_inserter(resultingCloners),
[&](ManagedValue mv) { return CleanupCloner(SGF, mv); });
}

ManagedValue CleanupCloner::clone(SILValue value) const {
if (isLValue) {
Expand Down
10 changes: 8 additions & 2 deletions lib/SILGen/Cleanup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,16 @@ class CleanupCloner {
public:
CleanupCloner(SILGenFunction &SGF, const ManagedValue &mv);
CleanupCloner(SILGenBuilder &builder, const ManagedValue &mv);
CleanupCloner(SILGenFunction &SGF, const RValue &rv);
CleanupCloner(SILGenBuilder &builder, const RValue &rv);

ManagedValue clone(SILValue value) const;

static void
getClonersForRValue(SILGenFunction &SGF, const RValue &rvalue,
SmallVectorImpl<CleanupCloner> &resultingCloners);

static void
getClonersForRValue(SILGenBuilder &builder, const RValue &rvalue,
SmallVectorImpl<CleanupCloner> &resultingCloners);
};

} // end namespace Lowering
Expand Down
2 changes: 2 additions & 0 deletions lib/SILGen/RValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Initialization;
class Scope;
class SILGenFunction;
class TypeLowering;
class CleanupCloner;

/// An "exploded" SIL rvalue, in which tuple values are recursively
/// destructured.
Expand Down Expand Up @@ -71,6 +72,7 @@ class TypeLowering;
class RValue {
friend class swift::Lowering::Scope;
friend class swift::Lowering::ArgumentSource;
friend class swift::Lowering::CleanupCloner;

std::vector<ManagedValue> values;
CanType type;
Expand Down
14 changes: 8 additions & 6 deletions lib/SILGen/Scope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,14 @@ RValue Scope::popPreservingValue(RValue &&rv) {
// recreate the RValue in the outer scope.
CanType type = rv.type;
unsigned numEltsRemaining = rv.elementsToBeAdded;
CleanupCloner cloner(SGF, rv);
llvm::SmallVector<SILValue, 4> values;
SmallVector<CleanupCloner, 4> cloners;
CleanupCloner::getClonersForRValue(SGF, rv, cloners);

SmallVector<SILValue, 4> values;
std::move(rv).forwardAll(SGF, values);

// Lifetime any address only values that we may have.
llvm::SmallVector<SILValue, 4> lifetimeExtendingBoxes;
SmallVector<SILValue, 4> lifetimeExtendingBoxes;
lifetimeExtendAddressOnlyRValueSubValues(SGF, loc, values,
lifetimeExtendingBoxes);

Expand All @@ -111,9 +113,9 @@ RValue Scope::popPreservingValue(RValue &&rv) {
// Reconstruct the managed values from the underlying sil values in the outer
// scope. Since the RValue wants a std::vector value, we use that instead.
std::vector<ManagedValue> managedValues;
std::transform(
values.begin(), values.end(), std::back_inserter(managedValues),
[&cloner](SILValue v) -> ManagedValue { return cloner.clone(v); });
for (unsigned i : indices(values)) {
managedValues.push_back(cloners[i].clone(values[i]));
}

// And then assemble the managed values into a rvalue.
return RValue(SGF, std::move(managedValues), type, numEltsRemaining);
Expand Down