[Mlir-commits] [mlir] 6000749 - [mlir] Fix build on gcc-5 after D104167

[River Riddle]

Author: River Riddle
Date: 2021-06-22T21:16:02Z
New Revision: 600074980410e3069e0e21294cc785c6bf38c0e3

URL: https://github.com/llvm/llvm-project/commit/600074980410e3069e0e21294cc785c6bf38c0e3
DIFF: https://github.com/llvm/llvm-project/commit/600074980410e3069e0e21294cc785c6bf38c0e3.diff

LOG: [mlir] Fix build on gcc-5 after D104167

Added: 
    

Modified: 
    mlir/test/mlir-tblgen/op-attribute.td
    mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/test/mlir-tblgen/op-attribute.td b/mlir/test/mlir-tblgen/op-attribute.td
index cef8cfcb913cd..0440dd165f9bf 100644
--- a/mlir/test/mlir-tblgen/op-attribute.td
+++ b/mlir/test/mlir-tblgen/op-attribute.td
@@ -36,7 +36,7 @@ def AOp : NS_Op<"a_op", []> {
 // DECL:      static ::llvm::ArrayRef<::llvm::StringRef> getAttributeNames()
 // DECL-NEXT:   static ::llvm::StringRef attrNames[] =
 // DECL-SAME:     {::llvm::StringRef("aAttr"), ::llvm::StringRef("bAttr"), ::llvm::StringRef("cAttr")};
-// DECL-NEXT:   return attrNames;
+// DECL-NEXT:   return ::llvm::makeArrayRef(attrNames);
 
 // DECL:      ::mlir::Identifier aAttrAttrName()
 // DECL-NEXT:      return getAttributeNameForIndex(0);

diff  --git a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
index ea68fe5af0cd3..4af4902c2c4cb 100644
--- a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
@@ -666,7 +666,7 @@ void OpEmitter::genAttrNameGetters() {
                               body << "::llvm::StringRef(\"" << attrName
                                    << "\")";
                             });
-      body << "};\n  return attrNames;";
+      body << "};\n  return ::llvm::makeArrayRef(attrNames);";
     }
   }