averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[semantic-sil] Move ValueOwnershipKind -> SILArgument and have subclasses pass in said value.

Browse Source 
This in the case of insertFunctionArgument requires a ValueOwnershipKind to be
specified since we use that for transformations of function argument lists that
are only correct after the transformation is complete. This only occurs in
FunctionSignatureOptimizations.

On the other hand, createFunctionArgument is only used to construct completely
new argument lists, so we can instead just rely on the function we are in rather
than require the user to pass it in.

rdar://29791263
This commit is contained in:
Michael Gottesman
2017-01-09 12:11:16 -08:00
parent 6acd2610a7
commit 5dea7ea07f
5 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/SIL/SILBasicBlock.cpp
View File

@@ -107,8 +107,10 @@ void SILBasicBlock::cloneArgumentList(SILBasicBlock *Other) {
assert(Other->isEntry() == isEntry() &&
"Expected to both blocks to be entries or not");
if (isEntry()) {
assert(args_empty() && "Expected to have no arguments");
for (auto *FuncArg : Other->getFunctionArguments()) {
createFunctionArgument(FuncArg->getType(), FuncArg->getDecl());
createFunctionArgument(FuncArg->getType(),
FuncArg->getDecl());
}
return;
}
@@ -122,14 +124,16 @@ void SILBasicBlock::cloneArgumentList(SILBasicBlock *Other) {
SILFunctionArgument *SILBasicBlock::createFunctionArgument(SILType Ty,
const ValueDecl *D) {
assert(isEntry() && "Function Arguments can only be in the entry block");
return new (getModule()) SILFunctionArgument(this, Ty, D);
auto OwnershipKind = ValueOwnershipKind::Any;
return new (getModule()) SILFunctionArgument(this, Ty, OwnershipKind, D);
}
SILFunctionArgument *SILBasicBlock::insertFunctionArgument(arg_iterator Iter,
SILType Ty,
ValueOwnershipKind OwnershipKind,
const ValueDecl *D) {
assert(isEntry() && "Function Arguments can only be in the entry block");
return new (getModule()) SILFunctionArgument(this, Iter, Ty, D);
return new (getModule()) SILFunctionArgument(this, Iter, Ty, OwnershipKind, D);
}
/// Replace the ith BB argument with a new one with type Ty (and optional