Skip to content

Commit 034a8a0

Browse files
eecksteineeckstein
authored
Merge pull request #71314 from eeckstein/fix-mandatory-specializtion
GenericCloner: make sure that we can always specialize in mandatory mode
2 parents a6dbfa9 + 874360e commit 034a8a0

File tree

8 files changed

+55
-24
lines changed

8 files changed

+55
-24
lines changed

‎SwiftCompilerSources/Sources/Optimizer/PassManager/ModulePassContext.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct ModulePassContext : Context, CustomStringConvertible {
131131
return function.isDefinition
132132
}
133133

134-
func createSpecializedFunctionDeclaration(
134+
func createEmptyFunction(
135135
name: String,
136136
parameters: [ParameterInfo],
137137
hasSelfParameter: Bool,
@@ -140,8 +140,8 @@ struct ModulePassContext : Context, CustomStringConvertible {
140140
return name._withBridgedStringRef { nameRef in
141141
let bridgedParamInfos = parameters.map { $0._bridged }
142142
return bridgedParamInfos.withUnsafeBufferPointer { paramBuf in
143-
_bridged.createSpecializedFunction(nameRef, paramBuf.baseAddress, paramBuf.count,
144-
hasSelfParameter, originalFunction.bridged).function
143+
_bridged.createEmptyFunction(nameRef, paramBuf.baseAddress, paramBuf.count,
144+
hasSelfParameter, originalFunction.bridged).function
145145
}
146146
}
147147
}

‎SwiftCompilerSources/Sources/Optimizer/Utilities/FunctionSignatureTransforms.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private func createSpecializedFunction(
8282
) -> Function {
8383
let (aliveParameters, hasSelfParameter) = getAliveParameters(of: originalFunction)
8484

85-
let specializedFunction = context.createSpecializedFunctionDeclaration(
85+
let specializedFunction = context.createEmptyFunction(
8686
name: name,
8787
parameters: aliveParameters,
8888
hasSelfParameter: hasSelfParameter,

‎include/swift/SILOptimizer/OptimizerBridging.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ struct BridgedPassContext {
286286
SWIFT_IMPORT_UNSAFE OptionalBridgedFunction lookUpNominalDeinitFunction(BridgedNominalTypeDecl nominal) const;
287287
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedSubstitutionMap getContextSubstitutionMap(BridgedType type) const;
288288
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getBuiltinIntegerType(SwiftInt bitWidth) const;
289-
SWIFT_IMPORT_UNSAFE BridgedFunction createSpecializedFunction(BridgedStringRef name,
290-
const BridgedParameterInfo * _Nullable bridgedParams,
291-
SwiftInt paramCount,
292-
bool hasSelfParam,
293-
BridgedFunction fromFunc) const;
289+
SWIFT_IMPORT_UNSAFE BridgedFunction createEmptyFunction(BridgedStringRef name,
290+
const BridgedParameterInfo * _Nullable bridgedParams,
291+
SwiftInt paramCount,
292+
bool hasSelfParam,
293+
BridgedFunction fromFunc) const;
294294
void moveFunctionBody(BridgedFunction sourceFunc, BridgedFunction destFunc) const;
295295

296296
// Passmanager housekeeping

‎lib/SILOptimizer/PassManager/PassManager.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,11 +1731,11 @@ bool BridgedPassContext::enableSimplificationFor(BridgedInstruction inst) const
17311731
}
17321732

17331733
BridgedFunction BridgedPassContext::
1734-
createSpecializedFunction(BridgedStringRef name,
1735-
const BridgedParameterInfo * _Nullable bridgedParams,
1736-
SwiftInt paramCount,
1737-
bool hasSelfParam,
1738-
BridgedFunction fromFunc) const {
1734+
createEmptyFunction(BridgedStringRef name,
1735+
const BridgedParameterInfo * _Nullable bridgedParams,
1736+
SwiftInt paramCount,
1737+
bool hasSelfParam,
1738+
BridgedFunction fromFunc) const {
17391739
swift::SILModule *mod = invocation->getPassManager()->getModule();
17401740
SILFunction *fromFn = fromFunc.getFunction();
17411741

@@ -1761,7 +1761,7 @@ createSpecializedFunction(BridgedStringRef name,
17611761
SILOptFunctionBuilder functionBuilder(*invocation->getTransform());
17621762

17631763
SILFunction *newF = functionBuilder.createFunction(
1764-
SILLinkage::Shared, name.unbridged(), newTy, nullptr, fromFn->getLocation(), fromFn->isBare(),
1764+
fromFn->getLinkage(), name.unbridged(), newTy, nullptr, fromFn->getLocation(), fromFn->isBare(),
17651765
fromFn->isTransparent(), fromFn->isSerialized(), IsNotDynamic, IsNotDistributed,
17661766
IsNotRuntimeAccessible, fromFn->getEntryCount(), fromFn->isThunk(),
17671767
fromFn->getClassSubclassScope(), fromFn->getInlineStrategy(), fromFn->getEffectsKind(),

‎lib/SILOptimizer/Utils/GenericCloner.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ using namespace swift;
3232
SILFunction *GenericCloner::createDeclaration(
3333
SILOptFunctionBuilder &FunctionBuilder, SILFunction *Orig,
3434
const ReabstractionInfo &ReInfo, StringRef NewName) {
35-
assert((!ReInfo.isSerialized() || Orig->isSerialized())
36-
&& "Specialization cannot make body more resilient");
3735
assert((Orig->isTransparent() || Orig->isBare() || Orig->getLocation())
3836
&& "SILFunction missing location");
3937
assert((Orig->isTransparent() || Orig->isBare() || Orig->getDebugScope())

‎lib/SILOptimizer/Utils/Generics.cpp

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3210,11 +3210,17 @@ void swift::trySpecializeApplyOfGeneric(
32103210
// not have an external entry point, Since the callee is not
32113211
// fragile we cannot serialize the body of the specialized
32123212
// callee either.
3213-
if (F->isSerialized() && !RefF->hasValidLinkageForFragileInline())
3214-
return;
3213+
bool needSetLinkage = false;
3214+
if (isMandatory) {
3215+
if (F->isSerialized() && !RefF->hasValidLinkageForFragileInline())
3216+
needSetLinkage = true;
3217+
} else {
3218+
if (F->isSerialized() && !RefF->hasValidLinkageForFragileInline())
3219+
return;
32153220

3216-
if (shouldNotSpecialize(RefF, F))
3217-
return;
3221+
if (shouldNotSpecialize(RefF, F))
3222+
return;
3223+
}
32183224

32193225
// If the caller and callee are both fragile, preserve the fragility when
32203226
// cloning the callee. Otherwise, strip it off so that we can optimize
@@ -3331,7 +3337,15 @@ void swift::trySpecializeApplyOfGeneric(
33313337
return;
33323338
}
33333339

3334-
if (F->isSerialized() && !SpecializedF->hasValidLinkageForFragileInline()) {
3340+
if (needSetLinkage) {
3341+
assert(F->isSerialized() && !RefF->hasValidLinkageForFragileInline());
3342+
// If called from a serialized function we cannot make the specialized function
3343+
// shared and non-serialized. The only other option is to keep the original
3344+
// function's linkage. It's not great, because it can prevent dead code
3345+
// elimination - usually the original function is a public function.
3346+
SpecializedF->setLinkage(RefF->getLinkage());
3347+
SpecializedF->setSerialized(IsNotSerialized);
3348+
} else if (F->isSerialized() && !SpecializedF->hasValidLinkageForFragileInline()) {
33353349
// If the specialized function already exists as a "IsNotSerialized" function,
33363350
// but now it's called from a "IsSerialized" function, we need to mark it as
33373351
// IsSerialized.

‎test/SILOptimizer/mandatory_performance_optimizations.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,14 @@ bb0(%0 : $Int, %1 : $@thick Int.Type, %2 : @owned $Builtin.NativeObject):
256256
return %2 : $Builtin.NativeObject
257257
}
258258

259-
// CHECK-LABEL: sil shared [ossa] @$s12metatype_argTf4dnn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> @owned Builtin.NativeObject {
259+
// CHECK-LABEL: sil [ossa] @$s12metatype_argTf4dnn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> @owned Builtin.NativeObject {
260260
// CHECK: bb0(%0 : $Int, %1 : @owned $Builtin.NativeObject):
261261
// CHECK: %2 = metatype $@thick Int.Type
262262
// CHECK: fix_lifetime %2 : $@thick Int.Type
263263
// CHECK: return %1 : $Builtin.NativeObject
264264
// CHECK: } // end sil function '$s12metatype_argTf4dnn_n'
265265

266-
// CHECK-LABEL: sil shared [ossa] @$s19metatype_arg_throwsTf4dnn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> (@owned Builtin.NativeObject, @error any Error) {
266+
// CHECK-LABEL: sil [ossa] @$s19metatype_arg_throwsTf4dnn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> (@owned Builtin.NativeObject, @error any Error) {
267267
// CHECK: bb0(%0 : $Int, %1 : @owned $Builtin.NativeObject):
268268
// CHECK: %2 = metatype $@thick Int.Type
269269
// CHECK: fix_lifetime %2 : $@thick Int.Type

‎test/embedded/default-arguments.swift

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded -o /dev/null
2+
3+
// REQUIRES: swift_in_compiler
4+
// REQUIRES: VENDOR=apple
5+
// REQUIRES: OS=macosx
6+
7+
// Check that this doesn't crash the compiler in embedded mode.
8+
9+
public func foo<T>(_ t: T) -> T {
10+
t
11+
}
12+
13+
public func testit(_ x: Int = foo(27)) -> Int {
14+
x
15+
}
16+
17+
public func callit() -> Int {
18+
testit()
19+
}

0 commit comments

Comments
 (0)