From 05e91a73dd24c6e944a6155b817e19e73a14dda2 Mon Sep 17 00:00:00 2001
From: Patrick Ferris <patrick@sirref.org>
Date: Sat, 26 Oct 2024 15:48:12 +0100
Subject: [PATCH] Prepare for 5.2 AST bump

---
 trace/ppx/trace_ppx.ml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/trace/ppx/trace_ppx.ml b/trace/ppx/trace_ppx.ml
index 5727b37ae..7b02d3871 100644
--- a/trace/ppx/trace_ppx.ml
+++ b/trace/ppx/trace_ppx.ml
@@ -173,10 +173,14 @@ let map_trace = object(self)
         let args = List.map (fun (x,y) -> x, self#expression y) args in
         if args = [] then hd
         else { e with pexp_desc = Pexp_apply (hd,args)}
-    | Pexp_fun(_,_,pat,rest) when not !enabled ->
-        let has_iftrace { ppat_attributes = l; _ } = has_iftrace_attribute l in
-        if has_iftrace pat then self#expression rest
-        else e
+    | Pexp_function (params, constraint_, rest) when not !enabled ->
+        let has_iftrace_pat { ppat_attributes = l; _ } = has_iftrace_attribute l in
+        let does_not_have_iftrace_param = function
+          | { pparam_desc = Pparam_val (_, _, pat); _ } -> not (has_iftrace_pat pat)
+          | _ -> true
+        in
+        let params = List.filter does_not_have_iftrace_param params in
+        { e with pexp_desc = Pexp_function (params, constraint_, rest) }
     | Pexp_let(_,[{pvb_pat = { ppat_attributes = l; _}; _}],rest) when not !enabled ->
         if has_iftrace_attribute l then self#expression rest
         else e