Workaround clang-format error in standard.c++

cloudflare · Aug 9, 2024 · 932daad · 932daad
1 parent 82c8a62
commit 932daad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -95,7 +95,7 @@ jobs:
       - name: Setup macOS
         if: runner.os == 'macOS'
         run: |
-          sudo brew install llvm@18
+          brew install llvm@18
           export PATH="$(brew --prefix llvm@18)/bin/bin:$PATH"
       - name: Setup Windows
         if: runner.os == 'Windows'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -88,7 +88,7 @@ jobs:
       - name: Setup macOS
         if: matrix.os.name == 'macOS'
         run: |
-          sudo brew install llvm@18
+          brew install llvm@18
           export PATH="$(brew --prefix llvm@18)/bin/bin:$PATH"
       - name: Setup Windows
         if: matrix.os.name == 'windows'

diff --git a/src/workerd/api/streams/standard.c++ b/src/workerd/api/streams/standard.c++
@@ -3638,12 +3638,12 @@ jsg::Promise<void> WritableStreamJsController::pipeLoop(jsg::Lock& js) {
       return pipeLoop(js);
     }
 
-    auto onSuccess = JSG_VISITABLE_LAMBDA(
+    auto onSuccess = JSG_VISITABLE_LAMBDA2(
         (this, ref=addRef()), (ref), (jsg::Lock& js) {
       return pipeLoop(js);
     });
 
-    auto onFailure = JSG_VISITABLE_LAMBDA(
+    auto onFailure = JSG_VISITABLE_LAMBDA2(
         (ref=addRef(),&source, preventCancel, pipeThrough),
         (ref), (jsg::Lock& js, jsg::Value value) {
       // The write failed. We handle it here because the pipe lock will have been released.

diff --git a/src/workerd/jsg/function.h b/src/workerd/jsg/function.h
@@ -519,4 +519,9 @@ template <> constexpr bool isGcVisitor<GcVisitor&>() { return true; }
     } \
   })
 
+// Clang format encounters a segfault when JSG_VISITABLE_LAMBDA is called from inside of a 
+// JSG_VISITABLE_LAMBDA, if we call JSG_VISITABLE_LAMBDA through JSG_VISITABLE_LAMBDA2 it works.
+#define JSG_VISITABLE_LAMBDA2(CAPTURES, VISITS, ...) JSG_VISITABLE_LAMBDA(CAPTURES, VISITS, __VA_ARGS__)
+
+
 }  // namespace workerd::jsg