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

[AST] Merge BridgedDiagnosticEngine + BridgedDiagEngine

Browse Source 
Introduce a macro that can stamp out wrapper
classes for underlying C++ pointers, and use
it to define BridgedDiagnosticEngine in
ASTBridging. Then, migrate users of
BridgedDiagEngine onto it.
This commit is contained in:
Hamish Knight
2023-10-30 23:49:55 +00:00
parent fe0ad60fe8
commit fce1cb54d5
18 changed files with 82 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/AST/ASTBridging.cpp
View File

@@ -17,14 +17,6 @@
using namespace swift;
namespace {
/// BridgedDiagEngine -> DiagnosticEngine *.
DiagnosticEngine *getDiagnosticEngine(const BridgedDiagEngine &bridged) {
return static_cast<DiagnosticEngine *>(bridged.object);
}
} // namespace
static_assert(sizeof(BridgedDiagnosticArgument) >= sizeof(DiagnosticArgument),
"BridgedDiagnosticArgument has wrong size");
@@ -45,12 +37,12 @@ BridgedDiagnosticFixIt::BridgedDiagnosticFixIt(BridgedSourceLoc start,
llvm::ArrayRef<DiagnosticArgument>())) {}
void DiagnosticEngine_diagnose(
BridgedDiagEngine bridgedEngine, BridgedSourceLoc loc,
BridgedDiagnosticEngine bridgedEngine, BridgedSourceLoc loc,
BridgedDiagID bridgedDiagID,
BridgedArrayRef /*BridgedDiagnosticArgument*/ bridgedArguments,
BridgedSourceLoc highlightStart, uint32_t hightlightLength,
BridgedArrayRef /*BridgedDiagnosticFixIt*/ bridgedFixIts) {
auto *D = getDiagnosticEngine(bridgedEngine);
auto *D = bridgedEngine.get();
auto diagID = static_cast<DiagID>(bridgedDiagID);
SmallVector<DiagnosticArgument, 2> arguments;
@@ -73,7 +65,6 @@ void DiagnosticEngine_diagnose(
}
}
bool DiagnosticEngine_hadAnyError(BridgedDiagEngine bridgedEngine) {
auto *D = getDiagnosticEngine(bridgedEngine);
return D->hadAnyError();
bool DiagnosticEngine_hadAnyError(BridgedDiagnosticEngine bridgedEngine) {
return bridgedEngine.get()->hadAnyError();
}