[ESI] Fix use-after-erase bug in connect services lowering

For some reason, this only showed up in the Windows CI.
llvm · Jul 5, 2024 · 792f1fe · 792f1fe
1 parent 1f7fc26
commit 792f1fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Dialect/ESI/ESIServices.cpp b/lib/Dialect/ESI/ESIServices.cpp
@@ -501,7 +501,7 @@ LogicalResult ESIConnectServicesPass::replaceInst(ServiceInstanceOp instOp,
 
   // Try to generate the service provider.
   if (failed(genDispatcher.generate(implOp, decl)))
-    return instOp.emitOpError("failed to generate server");
+    return implOp.emitOpError("failed to generate server");
 
   return success();
 }

diff --git a/test/Dialect/ESI/errors.mlir b/test/Dialect/ESI/errors.mlir
@@ -92,7 +92,7 @@ esi.service.decl @HostComms {
 
 hw.module @Top(in %clk: i1, in %rst: i1) {
   // expected-error @+2 {{'esi.service.impl_req' op did not recognize option name "badOpt"}}
-  // expected-error @+1 {{'esi.service.instance' op failed to generate server}}
+  // expected-error @+1 {{'esi.service.impl_req' op failed to generate server}}
   esi.service.instance #esi.appid<"cosim"> svc @HostComms impl as  "cosim" opts {badOpt = "wrong!"} (%clk, %rst) : (i1, i1) -> ()
 }