Skip to content

Another follow-up on the bridging rework #69117

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 2 commits into from
Oct 11, 2023
Merged

Another follow-up on the bridging rework #69117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bf7c0c
ASTBridging: make BridgedDiagnosticEngine a typedef again
eeckstein Oct 11, 2023
93db089
ASTBridging: fix storage size of BridgedDiagnosticFixIt
eeckstein Oct 11, 2023
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
7 changes: 4 additions & 3 deletions include/swift/AST/ASTBridging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ typedef enum ENUM_EXTENSIBILITY_ATTR(open) BridgedDiagID : uint32_t {
#include "swift/AST/DiagnosticsAll.def"
} BridgedDiagID;

struct BridgedDiagnosticEngine {
// Must match the definition of BridgedDiagnosticEngine in CASTBridging.h.
typedef struct {
void * _Nonnull object;
};
} BridgedDiagnosticEngine;

struct BridgedOptionalDiagnosticEngine {
void *_Nullable object;
Expand All @@ -66,7 +67,7 @@ class BridgedDiagnosticArgument {
};

class BridgedDiagnosticFixIt {
int64_t storage[6];
int64_t storage[7];

public:
#ifdef USED_IN_CPP_SOURCE
Expand Down
2 changes: 1 addition & 1 deletion lib/AST/ASTBridging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ BridgedDiagnosticArgument::BridgedDiagnosticArgument(BridgedStringRef s)
: BridgedDiagnosticArgument(DiagnosticArgument(s.get())) {}

static_assert(sizeof(BridgedDiagnosticFixIt) >= sizeof(DiagnosticInfo::FixIt),
"BridgedDiagnosticArgument has wrong size");
"BridgedDiagnosticFixIt has wrong size");

static SourceLoc getSourceLoc(BridgedSourceLoc bridgedLoc) {
return SourceLoc(llvm::SMLoc::getFromPointer(bridgedLoc.getLoc()));
Expand Down