From 2ccb836f49b3125a5a0bd83832d988d10ca130be Mon Sep 17 00:00:00 2001
From: Christian Sigg <csigg@google.com>
Date: Wed, 9 Oct 2019 11:32:54 -0700
Subject: [PATCH] Guard rewriter insertion point during signature conversion.

Avoid unexpected side effect in rewriter insertion point.

PiperOrigin-RevId: 273785794
---
 third_party/mlir/lib/Transforms/DialectConversion.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/third_party/mlir/lib/Transforms/DialectConversion.cpp b/third_party/mlir/lib/Transforms/DialectConversion.cpp
index a47f17b28a6..d65eae7f38b 100644
--- a/third_party/mlir/lib/Transforms/DialectConversion.cpp
+++ b/third_party/mlir/lib/Transforms/DialectConversion.cpp
@@ -284,6 +284,7 @@ void ArgConverter::applySignatureConversion(
   // Remap each of the original arguments as determined by the signature
   // conversion.
   auto &newArgMapping = argMapping[block];
+  OpBuilder::InsertionGuard guard(rewriter);
   rewriter.setInsertionPointToStart(block);
   for (unsigned i = 0; i != origArgCount; ++i) {
     ArrayRef<Value *> remappedValues;