Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

This commit is contained in:
Max Moiseev
2016-01-11 16:51:11 -08:00
531 changed files with 31135 additions and 19432 deletions

View File

@@ -658,7 +658,7 @@ namespace {
if (!source.shouldTake()) {
sourceTemp = B.createAllocStack(Loc,
sourceAddr.getType().getObjectType());
sourceAddr = sourceTemp->getAddressResult();
sourceAddr = sourceTemp;
B.createCopyAddr(Loc, source.Value, sourceAddr, IsNotTake,
IsInitialization);
}
@@ -677,7 +677,7 @@ namespace {
// Deallocate the source temporary if we needed one.
if (sourceTemp) {
B.createDeallocStack(Loc, sourceTemp->getContainerResult());
B.createDeallocStack(Loc, sourceTemp);
}
Source result = emitSome(resultObject, target, state);