From 1facbe9eb5e22435d408803f7cf2c267ed4d3895 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Tue, 2 Mar 2021 08:32:05 -0800
Subject: [PATCH] Integrate LLVM at llvm/llvm-project@7f086d74c347

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

PiperOrigin-RevId: 360434104
---
 WORKSPACE                                           | 4 ++--
 build_tools/llvm_version.txt                        | 2 +-
 lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index c958201..c44d977 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,9 +15,9 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "99c24f7aa8ccb84abde1672255439a2b2730ccc1"
+LLVM_COMMIT = "7f086d74c347750c1da619058eb5b3e79c2fae14"
 
-LLVM_SHA256 = "c031fbda3d8796fcc57aa16b54bfb39b8075b0f7a734273623da79e087d682ec"
+LLVM_SHA256 = "49590fd9975bab23a347859d945a8dcae1db35a1c32bd0d9387271a6b8058106"
 
 LLVM_BAZEL_TAG = "llvm-project-{commit}".format(commit = LLVM_COMMIT)
 
diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index b148913..bac96e2 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1,2 +1,2 @@
-99c24f7aa8ccb84abde1672255439a2b2730ccc1
+7f086d74c347750c1da619058eb5b3e79c2fae14
 
diff --git a/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc b/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
index c4e8903..abaa53f 100644
--- a/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
+++ b/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
@@ -607,8 +607,9 @@ struct HloLegalizeToLhlo
     populateHLOToLHLOConversionPattern(&context, &converter, &patterns);
     populateFuncOpTypeConversionPattern(patterns, &context, converter);
     populateCallOpTypeConversionPattern(patterns, &context, converter);
-    populateBranchOpInterfaceAndReturnOpTypeConversionPattern(
-        patterns, &context, converter);
+    populateBranchOpInterfaceTypeConversionPattern(patterns, &context,
+                                                   converter);
+    populateReturnOpTypeConversionPattern(patterns, &context, converter);
     populateEliminateBufferizeMaterializationsPatterns(&context, converter,
                                                        patterns);