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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2022-05-27 15:54:46 -07:00
parent 4ee528a886 b4dceb616f
commit dba6b83fba
5 changed files with 126 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/SIL/Parser/ParseSIL.cpp
View File

@@ -2795,7 +2795,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
if (parseSILDebugLocation(InstLoc, B))
return true;
ResultVal = B.createAllocBox(InstLoc, Ty.castTo<SILBoxType>(), VarInfo,
hasDynamicLifetime);
hasDynamicLifetime, hasReflection);
break;
}
case SILInstructionKind::ApplyInst:

9
lib/SILGen/Conversion.h
View File

@@ -231,13 +231,6 @@ canPeepholeConversions(SILGenFunction &SGF,
const Conversion &outerConversion,
const Conversion &innerConversion);
ManagedValue emitPeepholedConversions(SILGenFunction &SGF, SILLocation loc,
const Conversion &outerConversion,
const Conversion &innerConversion,
ConversionPeepholeHint hint,
SGFContext C,
ValueProducerRef produceValue);
/// An initialization where we ultimately want to apply a conversion to
/// the value before completing the initialization.
///
@@ -354,8 +347,6 @@ public:
void finishInitialization(SILGenFunction &SGF) override {
assert(getState() == Initialized);
State = Finished;
if (OwnedSubInitialization)
OwnedSubInitialization->finishInitialization(SGF);
}
};

144
lib/SILGen/SILGenConvert.cpp
View File

@@ -1074,6 +1074,69 @@ ConvertingInitialization::finishEmission(SILGenFunction &SGF,
llvm_unreachable("bad state");
}
static ManagedValue
emitPeepholedConversions(SILGenFunction &SGF, SILLocation loc,
const Conversion &outerConversion,
const Conversion &innerConversion,
ConversionPeepholeHint hint,
SGFContext C,
ValueProducerRef produceOrigValue) {
auto produceValue = [&](SGFContext C) {
if (!hint.isForced()) {
return produceOrigValue(SGF, loc, C);
}
auto value = produceOrigValue(SGF, loc, SGFContext());
auto &optTL = SGF.getTypeLowering(value.getType());
// isForceUnwrap is hardcoded true because hint.isForced() is only
// set by implicit force unwraps.
return SGF.emitCheckedGetOptionalValueFrom(loc, value,
/*isForceUnwrap*/ true,
optTL, C);
};
auto getBridgingSourceType = [&] {
CanType sourceType = innerConversion.getBridgingSourceType();
if (hint.isForced())
sourceType = sourceType.getOptionalObjectType();
return sourceType;
};
auto getBridgingResultType = [&] {
return outerConversion.getBridgingResultType();
};
auto getBridgingLoweredResultType = [&] {
return outerConversion.getBridgingLoweredResultType();
};
switch (hint.getKind()) {
case ConversionPeepholeHint::Identity:
return produceValue(C);
case ConversionPeepholeHint::BridgeToAnyObject: {
auto value = produceValue(SGFContext());
return SGF.emitNativeToBridgedValue(loc, value, getBridgingSourceType(),
getBridgingResultType(),
getBridgingLoweredResultType(), C);
}
case ConversionPeepholeHint::Subtype: {
// Otherwise, emit and convert.
// TODO: if the context allows +0, use it in more situations.
auto value = produceValue(SGFContext());
SILType loweredResultTy = getBridgingLoweredResultType();
// Nothing to do if the value already has the right representation.
if (value.getType().getObjectType() == loweredResultTy.getObjectType())
return value;
CanType sourceType = getBridgingSourceType();
CanType resultType = getBridgingResultType();
return SGF.emitTransformedValue(loc, value, sourceType, resultType, C);
}
}
llvm_unreachable("bad kind");
}
bool ConvertingInitialization::tryPeephole(SILGenFunction &SGF,
SILLocation loc,
ManagedValue origValue,
@@ -1104,6 +1167,15 @@ bool ConvertingInitialization::tryPeephole(SILGenFunction &SGF, SILLocation loc,
ManagedValue value = emitPeepholedConversions(SGF, loc, outerConversion,
innerConversion, *hint,
FinalContext, produceValue);
// The callers to tryPeephole assume that the initialization is ready to be
// finalized after returning. If this conversion sits on top of another
// initialization, forward the value into the underlying initialization and
// report the value as emitted in context.
if (FinalContext.getEmitInto() && !value.isInContext()) {
value.ensurePlusOne(SGF, loc).forwardInto(SGF, loc, FinalContext.getEmitInto());
value = ManagedValue::forInContext();
}
setConvertedValue(value);
return true;
}
@@ -1117,15 +1189,11 @@ void ConvertingInitialization::copyOrInitValueInto(SILGenFunction &SGF,
// TODO: take advantage of borrowed inputs?
if (!isInit) formalValue = formalValue.copy(SGF, loc);
State = Initialized;
SGFContext emissionContext = OwnedSubInitialization
? SGFContext() : FinalContext;
Value = TheConversion.emit(SGF, loc, formalValue, emissionContext);
Value = TheConversion.emit(SGF, loc, formalValue, FinalContext);
if (OwnedSubInitialization) {
OwnedSubInitialization->copyOrInitValueInto(SGF, loc,
Value,
isInit);
if (FinalContext.getEmitInto() && !Value.isInContext()) {
Value.forwardInto(SGF, loc, FinalContext.getEmitInto());
Value = ManagedValue::forInContext();
}
}
@@ -1512,65 +1580,3 @@ Lowering::canPeepholeConversions(SILGenFunction &SGF,
llvm_unreachable("bad kind");
}
ManagedValue
Lowering::emitPeepholedConversions(SILGenFunction &SGF, SILLocation loc,
const Conversion &outerConversion,
const Conversion &innerConversion,
ConversionPeepholeHint hint,
SGFContext C,
ValueProducerRef produceOrigValue) {
auto produceValue = [&](SGFContext C) {
if (!hint.isForced()) {
return produceOrigValue(SGF, loc, C);
}
auto value = produceOrigValue(SGF, loc, SGFContext());
auto &optTL = SGF.getTypeLowering(value.getType());
// isForceUnwrap is hardcoded true because hint.isForced() is only
// set by implicit force unwraps.
return SGF.emitCheckedGetOptionalValueFrom(loc, value,
/*isForceUnwrap*/ true,
optTL, C);
};
auto getBridgingSourceType = [&] {
CanType sourceType = innerConversion.getBridgingSourceType();
if (hint.isForced())
sourceType = sourceType.getOptionalObjectType();
return sourceType;
};
auto getBridgingResultType = [&] {
return outerConversion.getBridgingResultType();
};
auto getBridgingLoweredResultType = [&] {
return outerConversion.getBridgingLoweredResultType();
};
switch (hint.getKind()) {
case ConversionPeepholeHint::Identity:
return produceValue(C);
case ConversionPeepholeHint::BridgeToAnyObject: {
auto value = produceValue(SGFContext());
return SGF.emitNativeToBridgedValue(loc, value, getBridgingSourceType(),
getBridgingResultType(),
getBridgingLoweredResultType(), C);
}
case ConversionPeepholeHint::Subtype: {
// Otherwise, emit and convert.
// TODO: if the context allows +0, use it in more situations.
auto value = produceValue(SGFContext());
SILType loweredResultTy = getBridgingLoweredResultType();
// Nothing to do if the value already has the right representation.
if (value.getType().getObjectType() == loweredResultTy.getObjectType())
return value;
CanType sourceType = getBridgingSourceType();
CanType resultType = getBridgingResultType();
return SGF.emitTransformedValue(loc, value, sourceType, resultType, C);
}
}
llvm_unreachable("bad kind");
}

18
test/SIL/Parser/boxes.sil
View File

@@ -89,3 +89,21 @@ sil [ossa] @address_of_box : $@convention(thin) (@in { var Int }, @in <T> { let
entry(%0 : $*{ var Int }, %1 : $*<T> { let T } <Int>):
unreachable
}
// CHECK-LABEL: sil [ossa] @alloc_box_attrs
sil [ossa] @alloc_box_attrs : $@convention(thin) () -> () {
entry:
// CHECK: %0 = alloc_box $
%0 = alloc_box ${ let Int }
// CHECK: %1 = alloc_box [dynamic_lifetime] $
%1 = alloc_box [dynamic_lifetime] ${ let Int }
// CHECK: %2 = alloc_box [reflection] $
%2 = alloc_box [reflection] ${ let Int }
// CHECK: %3 = alloc_box [dynamic_lifetime] [reflection] $
%3 = alloc_box [dynamic_lifetime] [reflection] ${ let Int }
dealloc_box %3: ${ let Int }
dealloc_box %2: ${ let Int }
dealloc_box %1: ${ let Int }
dealloc_box %0: ${ let Int }
return undef : $()
}

32
test/SILGen/literal_closure_reabstraction_with_peephole.swift Normal file
View File

@@ -0,0 +1,32 @@
// RUN: %target-swift-emit-silgen -verify %s
fileprivate typealias Closure = () -> Void
func crash1() {
let closure1: Closure? = nil
let closure2: Closure? = nil
let closure3: Closure? = nil
print("Closures: \(String(describing: closure1)), \(String(describing: closure2)), \(String(describing: closure3))")
let closure = closure1 ?? closure2 ?? closure3
print("\(#line): \(String(describing: closure))")
closure?() // <- EXC_BAD_ACCESS
assert(closure == nil)
}
func crash2() {
let closure1: Closure? = nil
let closure2: Closure? = nil
let closure3: Closure? = { }
print("Closures: \(String(describing: closure1)), \(String(describing: closure2)), \(String(describing: closure3))")
let closure = closure1 ?? closure2 ?? closure3
print("\(#line): \(String(describing: closure))")
closure?() // <- EXC_BAD_ACCESS
assert(closure != nil)
}
crash1()
crash2()