Skip to content

LoadableByAddress: convert types of functions which are contained in structs inside global static initializers #65492

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
Apr 28, 2023
Merged

LoadableByAddress: convert types of functions which are contained in structs inside global static initializers #65492

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
115 changes: 59 additions & 56 deletions lib/IRGen/LoadableByAddress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "swift/SIL/DebugUtils.h"
#include "swift/SIL/SILArgument.h"
#include "swift/SIL/SILBuilder.h"
#include "swift/SIL/SILCloner.h"
#include "swift/SIL/SILUndef.h"
#include "swift/SILOptimizer/PassManager/Transforms.h"
#include "swift/SILOptimizer/Utils/InstOptUtils.h"
Expand Down Expand Up @@ -1713,6 +1714,8 @@ class LoadableByAddress : public SILModuleTransform {

bool shouldTransformGlobal(SILGlobalVariable *global);

bool shouldTransformInitExprOfGlobal(SILGlobalVariable *global);

private:
llvm::SetVector<SILFunction *> modFuncs;
llvm::SetVector<SingleValueInstruction *> conversionInstrs;
Expand All @@ -1724,6 +1727,8 @@ class LoadableByAddress : public SILModuleTransform {
llvm::SetVector<StoreInst *> storeToBlockStorageInstrs;
llvm::SetVector<SILInstruction *> modApplies;
llvm::MapVector<SILInstruction *, SILValue> allApplyRetToAllocMap;

public:
LargeSILTypeMapper MapperCache;
};
} // end anonymous namespace
Expand Down Expand Up @@ -2940,6 +2945,42 @@ bool LoadableByAddress::shouldTransformGlobal(SILGlobalVariable *global) {
return false;
}

bool LoadableByAddress::shouldTransformInitExprOfGlobal(SILGlobalVariable *global) {
for (const SILInstruction &initInst : *global) {
if (auto *fri = dyn_cast<FunctionRefBaseInst>(&initInst)) {
SILFunction *refF = fri->getInitiallyReferencedFunction();
if (modFuncs.count(refF) != 0)
return true;
}
}
return false;
}

namespace {
class GlobalInitCloner : public SILCloner<GlobalInitCloner> {
LoadableByAddress *pass;
IRGenModule *irgenModule;
public:
GlobalInitCloner(SILGlobalVariable *global, LoadableByAddress *pass,
IRGenModule *irgenModule)
: SILCloner<GlobalInitCloner>(global), pass(pass), irgenModule(irgenModule) {
}

SILType remapType(SILType ty) {
if (auto fnType = ty.getAs<SILFunctionType>()) {
GenericEnvironment *genEnv = getSubstGenericEnvironment(fnType);
return SILType::getPrimitiveObjectType(
pass->MapperCache.getNewSILFunctionType(genEnv, fnType, *irgenModule));
}
return ty;
}

void clone(SILInstruction *inst) {
visit(inst);
}
};
}

/// The entry point to this function transformation.
void LoadableByAddress::run() {
// Set the SIL state before the PassManager has a chance to run
Expand Down Expand Up @@ -3078,72 +3119,34 @@ void LoadableByAddress::run() {
updateLoweredTypes(F);
}

auto computeNewResultType = [&](SILType ty, IRGenModule *mod) -> SILType {
auto currSILFunctionType = ty.castTo<SILFunctionType>();
GenericEnvironment *genEnv =
getSubstGenericEnvironment(currSILFunctionType);
return SILType::getPrimitiveObjectType(
MapperCache.getNewSILFunctionType(genEnv, currSILFunctionType, *mod));
};

// Update globals' initializer.
SmallVector<SILGlobalVariable *, 16> deadGlobals;
for (SILGlobalVariable &global : getModule()->getSILGlobals()) {
SILInstruction *init = global.getStaticInitializerValue();
if (!init)
continue;
auto silTy = global.getLoweredType();
if (!isa<SILFunctionType>(silTy.getASTType()))
continue;
auto *decl = global.getDecl();
IRGenModule *currIRMod = getIRGenModule()->IRGen.getGenModule(
decl ? decl->getDeclContext() : nullptr);
auto silFnTy = global.getLoweredFunctionType();
GenericEnvironment *genEnv = getSubstGenericEnvironment(silFnTy);

// Update the global's type.
if (MapperCache.shouldTransformFunctionType(genEnv, silFnTy, *currIRMod)) {
auto newSILFnType =
MapperCache.getNewSILFunctionType(genEnv, silFnTy, *currIRMod);
global.unsafeSetLoweredType(
SILType::getPrimitiveObjectType(newSILFnType));
if (shouldTransformInitExprOfGlobal(&global)) {
auto *decl = global.getDecl();
IRGenModule *currIRMod = getIRGenModule()->IRGen.getGenModule(
decl ? decl->getDeclContext() : nullptr);

auto silTy = global.getLoweredType();
if (isa<SILFunctionType>(silTy.getASTType())) {
auto silFnTy = global.getLoweredFunctionType();
GenericEnvironment *genEnv = getSubstGenericEnvironment(silFnTy);
if (MapperCache.shouldTransformFunctionType(genEnv, silFnTy, *currIRMod)) {
auto newSILFnType =
MapperCache.getNewSILFunctionType(genEnv, silFnTy, *currIRMod);
global.unsafeSetLoweredType(SILType::getPrimitiveObjectType(newSILFnType));
}
}

// Rewrite the init basic block...
SmallVector<SILInstruction *, 8> initBlockInsts;
for (auto it = global.begin(), end = global.end(); it != end; ++it) {
initBlockInsts.push_back(const_cast<SILInstruction *>(&*it));
}
GlobalInitCloner cloner(&global, this, currIRMod);
for (auto *oldInst : initBlockInsts) {
if (auto *f = dyn_cast<FunctionRefInst>(oldInst)) {
SILBuilder builder(&global);
auto *newInst = builder.createFunctionRef(
f->getLoc(), f->getInitiallyReferencedFunction(), f->getKind());
f->replaceAllUsesWith(newInst);
global.unsafeRemove(f, *getModule());
} else if (auto *cvt = dyn_cast<ConvertFunctionInst>(oldInst)) {
auto newType = computeNewResultType(cvt->getType(), currIRMod);
SILBuilder builder(&global);
auto *newInst = builder.createConvertFunction(
cvt->getLoc(), cvt->getOperand(), newType,
cvt->withoutActuallyEscaping());
cvt->replaceAllUsesWith(newInst);
global.unsafeRemove(cvt, *getModule());
} else if (auto *thinToThick =
dyn_cast<ThinToThickFunctionInst>(oldInst)) {
auto newType =
computeNewResultType(thinToThick->getType(), currIRMod);
SILBuilder builder(&global);
auto *newInstr = builder.createThinToThickFunction(
thinToThick->getLoc(), thinToThick->getOperand(), newType);
thinToThick->replaceAllUsesWith(newInstr);
global.unsafeRemove(thinToThick, *getModule());
} else {
auto *sv = cast<SingleValueInstruction>(oldInst);
auto *newInst = cast<SingleValueInstruction>(oldInst->clone());
global.unsafeAppend(newInst);
sv->replaceAllUsesWith(newInst);
global.unsafeRemove(oldInst, *getModule());
}
cloner.clone(oldInst);
global.unsafeRemove(oldInst, *getModule());
}
}
}
Expand Down
17 changes: 16 additions & 1 deletion test/IRGen/big_types_coroutine.sil → test/IRGen/big_types.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %target-sil-opt -loadable-address -enable-sil-verify-all %s | %FileCheck %s

// REQUIRES: CPU=x86_64
// REQUIRES: PTRSIZE=64
// REQUIRES: OS=macosx

sil_stage canonical
Expand All @@ -19,9 +19,24 @@ public struct BigStruct {
var i8 : Int32 = 8
}

public struct ContainsClosure {
let c: () -> BigStruct
}

sil @make_big_struct : $@convention(thin) () -> BigStruct
sil @use_big_struct : $@convention(thin) (BigStruct) -> ()

// CHECK-LABEL: sil_global @globalWithClosureInStruct : $ContainsClosure = {
// CHECK: %0 = function_ref @make_big_struct : $@convention(thin) () -> @out BigStruct
// CHECK-NEXT: %1 = thin_to_thick_function %0 : $@convention(thin) () -> @out BigStruct to $@callee_guaranteed () -> @out BigStruct
// CHECK-NEXT: %initval = struct $ContainsClosure (%1 : $@callee_guaranteed () -> @out BigStruct)
// CHECK-NEXT: }
sil_global @globalWithClosureInStruct : $ContainsClosure = {
%0 = function_ref @make_big_struct : $@convention(thin) () -> BigStruct
%1 = thin_to_thick_function %0 : $@convention(thin) () -> BigStruct to $@callee_guaranteed () -> BigStruct
%initval = struct $ContainsClosure (%1 : $@callee_guaranteed () -> BigStruct)
}

// CHECK-LABEL: sil @test_yield_big : $@yield_once @convention(thin) () -> @yields @in BigStruct {
// CHECK: bb0:
// CHECK-NEXT: [[TEMP:%.*]] = alloc_stack $BigStruct
Expand Down