commit 6e8b3a71f2b8d4530665d544d9d4cfc9b49a4843
author Lukasz Anforowicz <lukasza@google.com> Thu Jun 02 09:10:01 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 02 09:10:32 2022 -0700
tree acea094f17a125774cee37a17fb0a51d8191e02c
parent 559b7233209b951b764de2353a120d8445263535

Propagate errors from `clang::tooling::applyAllReplacements`.

Chromium builds LLVM+Clang in Release+Asserts mode, which (before this
CL) would end up complaining about unchecked `llvm::Expected` from
`clang::tooling::applyAllReplacements`.

PiperOrigin-RevId: 452551782

rs_bindings_from_cc/src_code_gen.cc

diff --git a/rs_bindings_from_cc/src_code_gen.cc b/rs_bindings_from_cc/src_code_gen.cc
index e32c3a6..ba2f07f 100644
--- a/rs_bindings_from_cc/src_code_gen.cc
+++ b/rs_bindings_from_cc/src_code_gen.cc
@@ -7,8 +7,10 @@
 #include <string>
 
 #include "common/ffi_types.h"
+#include "common/status_macros.h"
 #include "rs_bindings_from_cc/ir.h"
 #include "clang/Format/Format.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/JSON.h"
 
@@ -27,7 +29,8 @@
                                             FfiU8Slice rustfmt_config_path);
 
 // Creates `Bindings` instance from copied data from `ffi_bindings`.
-static Bindings MakeBindingsFromFfiBindings(const FfiBindings& ffi_bindings) {
+static absl::StatusOr<Bindings> MakeBindingsFromFfiBindings(
+    const FfiBindings& ffi_bindings) {
   Bindings bindings;
 
   const FfiU8SliceBox& rs_api = ffi_bindings.rs_api;
@@ -36,11 +39,17 @@
   bindings.rs_api = std::string(rs_api.ptr, rs_api.size);
 
   std::string impl{rs_api_impl.ptr, rs_api_impl.size};
-  bindings.rs_api_impl = *clang::tooling::applyAllReplacements(
-      impl,
-      clang::format::reformat(
-          clang::format::getGoogleStyle(clang::format::FormatStyle::LK_Cpp),
-          impl, clang::tooling::Range(0, impl.size()), "<stdin>"));
+  llvm::Expected<std::string> maybe_formatted =
+      clang::tooling::applyAllReplacements(
+          impl,
+          clang::format::reformat(
+              clang::format::getGoogleStyle(clang::format::FormatStyle::LK_Cpp),
+              impl, clang::tooling::Range(0, impl.size()), "<stdin>"));
+  if (llvm::Error error = maybe_formatted.takeError()) {
+    return absl::InternalError(absl::StrCat("Failed to format rs_api_impl: ",
+                                            toString(std::move(error))));
+  }
+  bindings.rs_api_impl = *maybe_formatted;
 
   return bindings;
 }
@@ -51,15 +60,16 @@
   FreeFfiU8SliceBox(ffi_bindings.rs_api_impl);
 }
 
-Bindings GenerateBindings(const IR& ir, absl::string_view crubit_support_path,
-                          absl::string_view rustfmt_exe_path,
-                          absl::string_view rustfmt_config_path) {
+absl::StatusOr<Bindings> GenerateBindings(
+    const IR& ir, absl::string_view crubit_support_path,
+    absl::string_view rustfmt_exe_path, absl::string_view rustfmt_config_path) {
   std::string json = llvm::formatv("{0}", ir.ToJson());
 
   FfiBindings ffi_bindings = GenerateBindingsImpl(
       MakeFfiU8Slice(json), MakeFfiU8Slice(crubit_support_path),
       MakeFfiU8Slice(rustfmt_exe_path), MakeFfiU8Slice(rustfmt_config_path));
-  Bindings bindings = MakeBindingsFromFfiBindings(ffi_bindings);
+  CRUBIT_ASSIGN_OR_RETURN(Bindings bindings,
+                          MakeBindingsFromFfiBindings(ffi_bindings));
   FreeFfiBindings(ffi_bindings);
   return bindings;
 }