commit d434b0daae51f91f944ca35bf99111006b1ebc3c
author Thomas Joerg <tjoerg@google.com> Thu Oct 29 03:01:46 2020 -0700
committer Copybara-Service <iree-copybara-bot@google.com> Thu Oct 29 03:02:53 2020 -0700
tree 69a1ccad9c18debf79675bc6100b8a4575ce9ae0
parent 83e599cc5ce5763d726c341e7b2d5f7b2a98d39b

Integrate LLVM at llvm/llvm-project@4d11daa659a1

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

PiperOrigin-RevId: 339631220

SUBMODULE_VERSIONS

diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index 4684786..8265855 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -6,7 +6,7 @@
 4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
 f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
 8ac1a9f32bc8849a9974874fcc699ba9c5cba59d third_party/llvm-bazel
-23ed570af1cc165afea1b70a533a4a39d6656501 third_party/llvm-project
+4d11daa659a1833a85863ea920174da4d052a8ba third_party/llvm-project
 17b12a4481daa150e2d1ea3ada086b551b856707 third_party/marl
 d2cdb70e038370b5e28f353fe98ccd70af1cbc25 third_party/mlir-emitc
 d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11

iree/compiler/Dialect/HAL/IR/HALDialect.cpp

diff --git a/iree/compiler/Dialect/HAL/IR/HALDialect.cpp b/iree/compiler/Dialect/HAL/IR/HALDialect.cpp
index e2863d8..3c6c2e5 100644
--- a/iree/compiler/Dialect/HAL/IR/HALDialect.cpp
+++ b/iree/compiler/Dialect/HAL/IR/HALDialect.cpp
@@ -40,13 +40,18 @@
 struct HALInlinerInterface : public DialectInlinerInterface {
   using DialectInlinerInterface::DialectInlinerInterface;
 
-  bool isLegalToInline(Region *dest, Region *src,
+  bool isLegalToInline(Operation *call, Operation *callable,
+                       bool wouldBeCloned) const final {
+    // Sure!
+    return true;
+  }
+  bool isLegalToInline(Region *dest, Region *src, bool wouldBeCloned,
                        BlockAndValueMapping &valueMapping) const final {
     // Sure!
     return true;
   }
 
-  bool isLegalToInline(Operation *op, Region *dest,
+  bool isLegalToInline(Operation *op, Region *dest, bool wouldBeCloned,
                        BlockAndValueMapping &valueMapping) const final {
     // Sure!
     return true;

iree/compiler/Dialect/Shape/IR/ShapeDialect.cpp

diff --git a/iree/compiler/Dialect/Shape/IR/ShapeDialect.cpp b/iree/compiler/Dialect/Shape/IR/ShapeDialect.cpp
index 02009b6..a7d9db0 100644
--- a/iree/compiler/Dialect/Shape/IR/ShapeDialect.cpp
+++ b/iree/compiler/Dialect/Shape/IR/ShapeDialect.cpp
@@ -36,7 +36,12 @@
 struct ShapeInlinerInterface : public DialectInlinerInterface {
   using DialectInlinerInterface::DialectInlinerInterface;
 
-  bool isLegalToInline(Operation* op, Region* dest,
+  // Allow all call operations to be inlined.
+  bool isLegalToInline(Operation* call, Operation* callable,
+                       bool wouldBeCloned) const final {
+    return true;
+  }
+  bool isLegalToInline(Operation* op, Region* dest, bool wouldBeCloned,
                        BlockAndValueMapping& valueMapping) const final {
     return true;
   }

iree/compiler/Dialect/VM/IR/VMDialect.cpp

diff --git a/iree/compiler/Dialect/VM/IR/VMDialect.cpp b/iree/compiler/Dialect/VM/IR/VMDialect.cpp
index 5455cbd..b7f984f 100644
--- a/iree/compiler/Dialect/VM/IR/VMDialect.cpp
+++ b/iree/compiler/Dialect/VM/IR/VMDialect.cpp
@@ -117,7 +117,12 @@
 struct VMInlinerInterface : public DialectInlinerInterface {
   using DialectInlinerInterface::DialectInlinerInterface;
 
-  bool isLegalToInline(Region *dest, Region *src,
+  // Allow all call operations to be inlined.
+  bool isLegalToInline(Operation *call, Operation *callable,
+                       bool wouldBeCloned) const final {
+    return true;
+  }
+  bool isLegalToInline(Region *dest, Region *src, bool wouldBeCloned,
                        BlockAndValueMapping &valueMapping) const final {
     // TODO(benvanik): disallow inlining across async calls.
 
@@ -132,7 +137,7 @@
     return true;
   }
 
-  bool isLegalToInline(Operation *op, Region *dest,
+  bool isLegalToInline(Operation *op, Region *dest, bool wouldBeCloned,
                        BlockAndValueMapping &valueMapping) const final {
     // TODO(benvanik): disallow inlining across async calls.
     return true;