diff --git a/lib/Conversion/FlyToROCDL/FlyToROCDL.cpp b/lib/Conversion/FlyToROCDL/FlyToROCDL.cpp
index b575e07903..d62105d852 100644
--- a/lib/Conversion/FlyToROCDL/FlyToROCDL.cpp
+++ b/lib/Conversion/FlyToROCDL/FlyToROCDL.cpp
@@ -771,24 +771,17 @@ class GpuLaunchFuncOpLowering : public OpConversionPattern<gpu::LaunchFuncOp> {
     if (Value tok = op.getAsyncToken())
       asyncTokenType = tok.getType();
 
-    // There are two relevant builder signatures in this MLIR:
-    // - (kernel, ..., asyncTokenType, asyncDependencies, clusterSize)
-    // - (kernel, ..., asyncObject, clusterSize)
-    // Pick the one that matches the original op structure.
-    if (Value asyncObj = adaptor.getAsyncObject()) {
-      if (!adaptor.getAsyncDependencies().empty())
-        return rewriter.notifyMatchFailure(
-            op, "launch_func has both asyncObject and asyncDependencies");
-
-      rewriter.replaceOpWithNewOp<gpu::LaunchFuncOp>(
-          op, kernelRef, grid, block, adaptor.getDynamicSharedMemorySize(),
-          adaptor.getKernelOperands(), asyncObj, clusterSize);
-      return success();
-    }
+    // The two former builder signatures (one taking asyncTokenType +
+    // asyncDependencies, one taking asyncObject) were merged upstream into a
+    // single builder that takes all of them.
+    if (adaptor.getAsyncObject() && !adaptor.getAsyncDependencies().empty())
+      return rewriter.notifyMatchFailure(op,
+                                         "launch_func has both asyncObject and asyncDependencies");
 
     rewriter.replaceOpWithNewOp<gpu::LaunchFuncOp>(
         op, kernelRef, grid, block, adaptor.getDynamicSharedMemorySize(),
-        adaptor.getKernelOperands(), asyncTokenType, adaptor.getAsyncDependencies(), clusterSize);
+        adaptor.getKernelOperands(), asyncTokenType, adaptor.getAsyncDependencies(),
+        adaptor.getAsyncObject(), clusterSize);
     return success();
   }
 };
diff --git a/thirdparty/llvm-build-info.json b/thirdparty/llvm-build-info.json
index 3df2018697..18e85f359f 100644
--- a/thirdparty/llvm-build-info.json
+++ b/thirdparty/llvm-build-info.json
@@ -1,6 +1,6 @@
 {
   "upstream": {
     "repository": "https://github.com/llvm/llvm-project.git",
-    "llvm_hash": "e2a39f504fee836e4def9581bed817ecc327b9dc"
+    "llvm_hash": "941a04e69ee8fe4c7a162b2f1e215aa8df867534"
   }
 }