From 950ba12426e333cd68c858ca425541563f576541 Mon Sep 17 00:00:00 2001
From: Stella Laurenzo <stellaraccident@gmail.com>
Date: Fri, 8 May 2020 20:42:40 -0700
Subject: [PATCH] Bump llvm-project to
 3af85fa8f06220b43f03f26de216a67be4568fe7.

---
 README.md                      | 2 +-
 lib/Dialect/Numpy/NumpyOps.cpp | 2 +-
 lib/Dialect/TCP/IR/TCPOps.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0e3bc0b52..704f3bb2c 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ export LDFLAGS=-fuse-ld=$(which ld.lld-$LLVM_VERSION)
 export LLVM_SRC_DIR=/path/to/llvm-project
 
 # Check out last known good commit.
-(cd $LLVM_SRC_DIR && git checkout 0c4aab27b3da05dd1b0c0c39472525325fda5e23)
+(cd $LLVM_SRC_DIR && git checkout 3af85fa8f06220b43f03f26de216a67be4568fe7)
 
 ./tools/install_mlir.sh
 ./tools/cmake_configure.sh
diff --git a/lib/Dialect/Numpy/NumpyOps.cpp b/lib/Dialect/Numpy/NumpyOps.cpp
index 8c813445d..ae3b76b41 100644
--- a/lib/Dialect/Numpy/NumpyOps.cpp
+++ b/lib/Dialect/Numpy/NumpyOps.cpp
@@ -74,7 +74,7 @@ static ParseResult parseGenericUfuncOp(OpAsmParser &parser,
     SmallVector<OpAsmParser::OperandType, 2> argNames;
     SmallVector<Type, 2> argTypes;
     SmallVector<Type, 1> resultTypes;
-    SmallVector<SmallVector<NamedAttribute, 2>, 1> unusedAttrs;
+    SmallVector<NamedAttrList, 1> unusedAttrs;
     bool isVariadic = false;
     if (::mlir::impl::parseFunctionSignature(parser, false, argNames, argTypes,
                                              unusedAttrs, isVariadic,
diff --git a/lib/Dialect/TCP/IR/TCPOps.cpp b/lib/Dialect/TCP/IR/TCPOps.cpp
index d5ce58253..99116a7cb 100644
--- a/lib/Dialect/TCP/IR/TCPOps.cpp
+++ b/lib/Dialect/TCP/IR/TCPOps.cpp
@@ -18,7 +18,7 @@ using namespace mlir::NPCOMP::tcp;
 
 LogicalResult AbortIfErrorOp::inferReturnTypes(
     MLIRContext *context, Optional<Location> location, ValueRange operands,
-    ArrayRef<NamedAttribute> attributes, RegionRange regions,
+    DictionaryAttr attributes, RegionRange regions,
     SmallVectorImpl<Type> &inferredReturnTypes) {
   inferredReturnTypes.push_back(NoneType::get(context));
   return success();
@@ -30,7 +30,7 @@ LogicalResult AbortIfErrorOp::inferReturnTypes(
 
 LogicalResult GetExtentOp::inferReturnTypes(
     MLIRContext *context, Optional<Location> location, ValueRange operands,
-    ArrayRef<NamedAttribute> attributes, RegionRange regions,
+    DictionaryAttr attributes, RegionRange regions,
     SmallVectorImpl<Type> &inferredReturnTypes) {
   inferredReturnTypes.push_back(IndexType::get(context));
   return success();