commit 8c5bb4505525be60bbb03a7c4cca197ae0168aff
author Wyatt Hepler <hepler@google.com> Mon Aug 29 23:52:29 2022 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 29 23:52:29 2022 +0000
tree ebfad4cb3a9d297be9be01cdaaa892b2368b8b9e
parent e415fc8d9063c518504cfa8820e50862bc900ae6

third_party/fuchsia: Replace assert() with PW_ASSERT()

Replace assert() with PW_ASSERT() and update the patch file.

Change-Id: I171a4eba6897268499f2cda65b8271fce70d9183
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/108553
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>

third_party/fuchsia/function.patch

diff --git a/third_party/fuchsia/function.patch b/third_party/fuchsia/function.patch
index 05580e6..0858b74 100644
--- a/third_party/fuchsia/function.patch
+++ b/third_party/fuchsia/function.patch
@@ -20,7 +20,7 @@
 diff --git a/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/function_internal.h b/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/function_internal.h
 --- a/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/function_internal.h
 +++ b/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/function_internal.h
-@@ -15,6 +15,8 @@
+@@ -16,6 +16,8 @@
  #include <utility>
 
  #include "nullable.h"
@@ -29,26 +29,35 @@
 
  namespace fit {
  namespace internal {
-@@ -41,7 +43,7 @@ template <typename Result, typename... Args>
- struct target<decltype(nullptr),
-               /*is_inline=*/true, /*is_shared=*/false, Result, Args...>
-     final {
--  static Result invoke(void* /*bits*/, Args... /*args*/) { __builtin_abort(); }
-+  static Result invoke(void* /*bits*/, Args... /*args*/) { PW_ASSERT(false); }
+@@ -79,7 +81,7 @@ inline const void* unshared_target_type_id(void* /*bits*/, const void* impl_ops)
+ // vtable for nullptr functions. This avoids generating unnecessary identical
+ // vtables, which reduces code size.
+ struct null_target {
+-  static void invoke(void* /*bits*/) { __builtin_abort(); }
++  static void invoke(void* /*bits*/) { PW_ASSERT(false); }
 
-   static const target_ops<Result, Args...> ops;
+   static const target_ops<void> ops;
  };
-@@ -319,7 +321,8 @@ class function_base<inline_target_size, require_inline, Result(Args...)> {
+@@ -398,7 +400,8 @@ class function_base<inline_target_size, require_inline, Result(Args...)> {
    // Note that fit::callback will release the target immediately after
    // invoke() (also affecting any share()d copies).
    // Aborts if the function's target is empty.
 -  Result invoke(Args... args) const {
 +  // TODO(b/241567321): Remove "no sanitize" after pw_protobuf is fixed.
 +  Result invoke(Args... args) const PW_NO_SANITIZE("function") {
-     return storage_.ops->invoke(&storage_.bits, std::forward<Args>(args)...);
+     // Down cast the ops to the derived type that this function was instantiated
+     // with, which includes the invoke function.
+     //
+@@ -472,7 +475,7 @@ class function_base<inline_target_size, require_inline, Result(Args...)> {
+   template <typename SharedFunction>
+   void copy_shared_target_to(SharedFunction& copy) {
+     copy.destroy_target();
+-    assert(storage_.ops == &shared_target_type<SharedFunction>::ops);
++    PW_ASSERT(storage_.ops == &shared_target_type<SharedFunction>::ops);
+     shared_target_type<SharedFunction>::copy_shared_ptr(&storage_.bits, &copy.storage_.bits);
+     copy.storage_.ops = storage_.ops;
    }
-
-@@ -430,7 +433,7 @@ class function_base<inline_target_size, require_inline, Result(Args...)> {
+@@ -516,7 +519,7 @@ class function_base<inline_target_size, require_inline, Result(Args...)> {
    void check_target_type() const {
      if (target_type<Callable>::ops.target_type_id(nullptr, &target_type<Callable>::ops) !=
          target_type_id()) {

third_party/fuchsia/generate_fuchsia_patch.py

diff --git a/third_party/fuchsia/generate_fuchsia_patch.py b/third_party/fuchsia/generate_fuchsia_patch.py
index 91791ac..05f6f11 100755
--- a/third_party/fuchsia/generate_fuchsia_patch.py
+++ b/third_party/fuchsia/generate_fuchsia_patch.py
@@ -18,6 +18,7 @@
 """
 
 from pathlib import Path
+import re
 import subprocess
 import tempfile
 from typing import Iterable, TextIO, Optional, Union
@@ -83,8 +84,13 @@
                         f'\n#include "{include}"\n\nnamespace ', 1)
 
 
-def _patch_abort(text: str) -> str:
+_ASSERT = re.compile(r'\bassert\(')
+
+
+def _patch_assert(text: str) -> str:
     replaced = text.replace('__builtin_abort()', 'PW_ASSERT(false)')
+    replaced = _ASSERT.sub('PW_ASSERT(', replaced)
+
     if replaced == text:
         return replaced
 
@@ -108,7 +114,7 @@
 
 def _patch(file: Path) -> Optional[str]:
     text = file.read_text()
-    updated = _patch_abort(text)
+    updated = _patch_assert(text)
     updated = _patch_invoke(file, updated)
     return None if text == updated else updated