commit 4c1019f834326239979c302b314cfc1e40a08a63
author Benjamin Kramer <kramerb@google.com> Mon Nov 22 04:47:09 2021 -0800
committer Copybara Fixup Action <iree-github-actions-bot@google.com> Mon Nov 22 12:48:38 2021 +0000
tree da602d8e67e6f9ae1cba0e867eb188c635845703
parent 9abc2fe791a9cf744cc7658169f5584627251504

Integrate LLVM at llvm/llvm-project@4348cd42c385

Updates LLVM usage to match
[4348cd42c385](https://github.com/llvm/llvm-project/commit/4348cd42c385)

PiperOrigin-RevId: 411526665

SUBMODULE_VERSIONS.txt

diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
index 6c965b3..d4b6365 100644
--- a/SUBMODULE_VERSIONS.txt
+++ b/SUBMODULE_VERSIONS.txt
@@ -4,7 +4,7 @@
 aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
 acd6f6f014c25e46363e718381e0b35205df2d83 third_party/libyaml
-20f79f8caa3a333a34021f0028e828f97d79c2a1 third_party/llvm-project
+4348cd42c385e71b63e5da7e492172cff6a79d7b third_party/llvm-project
 d0ee2ca2145e07e237dacb7ec7ded84f4a7842fc third_party/mlir-hlo
 3f701faace7addc75d16dea8a6cd769fa5b3f260 third_party/musl
 4c7697dbe973ed01ae6fbec37d186ebd05982e1f third_party/pybind11

iree/compiler/Dialect/Util/IR/BUILD

diff --git a/iree/compiler/Dialect/Util/IR/BUILD b/iree/compiler/Dialect/Util/IR/BUILD
index c602293..e68c1c9 100644
--- a/iree/compiler/Dialect/Util/IR/BUILD
+++ b/iree/compiler/Dialect/Util/IR/BUILD
@@ -30,6 +30,7 @@
     deps = [
         "@llvm-project//mlir:CallInterfacesTdFiles",
         "@llvm-project//mlir:ControlFlowInterfacesTdFiles",
+        "@llvm-project//mlir:InferTypeOpInterfaceTdFiles",
         "@llvm-project//mlir:OpBaseTdFiles",
         "@llvm-project//mlir:SideEffectTdFiles",
         "@llvm-project//mlir:SubElementInterfacesTdFiles",

iree/compiler/Dialect/Util/IR/UtilBase.td

diff --git a/iree/compiler/Dialect/Util/IR/UtilBase.td b/iree/compiler/Dialect/Util/IR/UtilBase.td
index 42a1f46..ca0ba39 100644
--- a/iree/compiler/Dialect/Util/IR/UtilBase.td
+++ b/iree/compiler/Dialect/Util/IR/UtilBase.td
@@ -147,7 +147,6 @@
   let description = [{
     Pointer to a typed value.
   }];
-  let builderCall = "$_builder.getType<IREE::Util::PtrType>()";
 }
 
 class Util_PtrOf<Type type> :

iree/compiler/Dialect/Util/IR/UtilOps.h

diff --git a/iree/compiler/Dialect/Util/IR/UtilOps.h b/iree/compiler/Dialect/Util/IR/UtilOps.h
index 02cc7ad..ce84b3f 100644
--- a/iree/compiler/Dialect/Util/IR/UtilOps.h
+++ b/iree/compiler/Dialect/Util/IR/UtilOps.h
@@ -15,6 +15,7 @@
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
+#include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Transforms/DialectConversion.h"
 

iree/compiler/Dialect/Util/IR/UtilOps.td

diff --git a/iree/compiler/Dialect/Util/IR/UtilOps.td b/iree/compiler/Dialect/Util/IR/UtilOps.td
index fb3b917..ef8a064 100644
--- a/iree/compiler/Dialect/Util/IR/UtilOps.td
+++ b/iree/compiler/Dialect/Util/IR/UtilOps.td
@@ -12,6 +12,7 @@
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/CallInterfaces.td"
 include "mlir/Interfaces/ControlFlowInterfaces.td"
+include "mlir/Interfaces/InferTypeOpInterface.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 
 //===----------------------------------------------------------------------===//

third_party/llvm-project

diff --git a/third_party/llvm-project b/third_party/llvm-project
index 20f79f8..4348cd4 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 20f79f8caa3a333a34021f0028e828f97d79c2a1
+Subproject commit 4348cd42c385e71b63e5da7e492172cff6a79d7b