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

Swift Bridging: use C++ instead of C bridging for BridgedFunction

Browse Source
This commit is contained in:
Erik Eckstein
2023-03-17 09:54:46 +01:00
parent e469c16744
commit ae7770d911
9 changed files with 257 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/SIL/IR/SILFunction.cpp
View File

@@ -144,13 +144,13 @@ SILFunction::create(SILModule &M, SILLinkage linkage, StringRef name,
}
static SwiftMetatype functionMetatype;
static FunctionRegisterFn initFunction = nullptr;
static FunctionRegisterFn destroyFunction = nullptr;
static FunctionWriteFn writeFunction = nullptr;
static FunctionParseFn parseFunction = nullptr;
static FunctionCopyEffectsFn copyEffectsFunction = nullptr;
static FunctionGetEffectInfoFn getEffectInfoFunction = nullptr;
static FunctionGetMemBehviorFn getMemBehvaiorFunction = nullptr;
static BridgedFunction::RegisterFn initFunction = nullptr;
static BridgedFunction::RegisterFn destroyFunction = nullptr;
static BridgedFunction::WriteFn writeFunction = nullptr;
static BridgedFunction::ParseFn parseFunction = nullptr;
static BridgedFunction::CopyEffectsFn copyEffectsFunction = nullptr;
static BridgedFunction::GetEffectInfoFn getEffectInfoFunction = nullptr;
static BridgedFunction::GetMemBehaviorFn getMemBehvaiorFunction = nullptr;
SILFunction::SILFunction(
SILModule &Module, SILLinkage Linkage, StringRef Name,
@@ -951,12 +951,12 @@ void SILFunction::forEachSpecializeAttrTargetFunction(
}
}
void Function_register(SwiftMetatype metatype,
FunctionRegisterFn initFn, FunctionRegisterFn destroyFn,
FunctionWriteFn writeFn, FunctionParseFn parseFn,
FunctionCopyEffectsFn copyEffectsFn,
FunctionGetEffectInfoFn effectInfoFn,
FunctionGetMemBehviorFn memBehaviorFn) {
void BridgedFunction::registerBridging(SwiftMetatype metatype,
RegisterFn initFn, RegisterFn destroyFn,
WriteFn writeFn, ParseFn parseFn,
CopyEffectsFn copyEffectsFn,
GetEffectInfoFn effectInfoFn,
GetMemBehaviorFn memBehaviorFn) {
functionMetatype = metatype;
initFunction = initFn;
destroyFunction = destroyFn;
@@ -970,8 +970,8 @@ void Function_register(SwiftMetatype metatype,
std::pair<const char *, int> SILFunction::
parseArgumentEffectsFromSource(StringRef effectStr, ArrayRef<StringRef> paramNames) {
if (parseFunction) {
BridgedParsingError error = parseFunction(
{this}, effectStr, ParseArgumentEffectsFromSource, -1,
auto error = parseFunction(
{this}, effectStr, BridgedFunction::ParseEffectsMode::argumentEffectsFromSource, -1,
{(const unsigned char *)paramNames.data(), paramNames.size()});
return {(const char *)error.message, (int)error.position};
}
@@ -981,8 +981,8 @@ parseArgumentEffectsFromSource(StringRef effectStr, ArrayRef<StringRef> paramNam
std::pair<const char *, int> SILFunction::
parseArgumentEffectsFromSIL(StringRef effectStr, int argumentIndex) {
if (parseFunction) {
BridgedParsingError error = parseFunction(
{this}, effectStr, ParseArgumentEffectsFromSIL, argumentIndex, {nullptr, 0});
auto error = parseFunction(
{this}, effectStr, BridgedFunction::ParseEffectsMode::argumentEffectsFromSIL, argumentIndex, {nullptr, 0});
return {(const char *)error.message, (int)error.position};
}
return {nullptr, 0};
@@ -990,8 +990,8 @@ parseArgumentEffectsFromSIL(StringRef effectStr, int argumentIndex) {
std::pair<const char *, int> SILFunction::parseGlobalEffectsFromSIL(StringRef effectStr) {
if (parseFunction) {
BridgedParsingError error = parseFunction(
{this}, effectStr, ParseGlobalEffectsFromSIL, -1, {nullptr, 0});
auto error = parseFunction(
{this}, effectStr, BridgedFunction::ParseEffectsMode::globalEffectsFromSIL, -1, {nullptr, 0});
return {(const char *)error.message, (int)error.position};
}
return {nullptr, 0};
@@ -1000,8 +1000,8 @@ std::pair<const char *, int> SILFunction::parseGlobalEffectsFromSIL(StringRef e
std::pair<const char *, int> SILFunction::
parseMultipleEffectsFromSIL(StringRef effectStr) {
if (parseFunction) {
BridgedParsingError error = parseFunction(
{this}, effectStr, ParseMultipleEffectsFromSIL, -1, {nullptr, 0});
auto error = parseFunction(
{this}, effectStr, BridgedFunction::ParseEffectsMode::multipleEffectsFromSIL, -1, {nullptr, 0});
return {(const char *)error.message, (int)error.position};
}
return {nullptr, 0};
@@ -1035,7 +1035,7 @@ visitArgEffects(std::function<void(int, int, bool)> c) const {
int idx = 0;
BridgedFunction bridgedFn = {const_cast<SILFunction *>(this)};
while (true) {
BridgedEffectInfo ei = getEffectInfoFunction(bridgedFn, idx);
BridgedFunction::EffectInfo ei = getEffectInfoFunction(bridgedFn, idx);
if (!ei.isValid)
return;
if (!ei.isEmpty) {