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

Merge pull request #64006 from rintaro/macros-plugin-errhandling

Browse Source 
[Macros] Improve error handling for executable macro plugins
This commit is contained in:
Rintaro Ishizaki
2023-03-02 22:10:51 -08:00
committed by GitHub
parent 0d289502c1 a6e0191bc0
commit 93aabfff01
5 changed files with 188 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/AST/CASTBridging.cpp
View File

@@ -653,15 +653,26 @@ bool Plugin_sendMessage(PluginHandle handle, const BridgedData data) {
auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
StringRef message(data.baseAddress, data.size);
auto error = plugin->sendMessage(message);
bool hadError = bool(error);
llvm::consumeError(std::move(error));
return hadError;
if (error) {
// FIXME: Pass the error message back to the caller.
llvm::consumeError(std::move(error));
// llvm::handleAllErrors(std::move(error), [](const llvm::ErrorInfoBase &err) {
// llvm::errs() << err.message() << "\n";
// });
return true;
}
return false;
}
bool Plugin_waitForNextMessage(PluginHandle handle, BridgedData *out) {
auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
auto result = plugin->waitForNextMessage();
if (!result) {
// FIXME: Pass the error message back to the caller.
llvm::consumeError(result.takeError());
// llvm::handleAllErrors(result.takeError(), [](const llvm::ErrorInfoBase &err) {
// llvm::errs() << err.message() << "\n";
// });
return true;
}
auto &message = result.get();