[PATCH] D72924: [mlir][spirv] Add `const` qualifier for static arrays

[Lei Zhang via Phabricator via llvm-commits]

antiagainst created this revision.
antiagainst added reviewers: ftynse, rriddle.
Herald added subscribers: llvm-commits, liufengdb, lucyrfox, mgester, arpith-jacob, shauheen, burmako, jpienaar, mehdi_amini.
Herald added a reviewer: mravishankar.
Herald added a reviewer: nicolasvasilache.
Herald added a project: LLVM.

This makes the local variable `implies` to have the correct
type to satisfy ArrayRef's constructor:

  /*implicit*/ constexpr ArrayRef(const T (&Arr)[N])

Hopefully this should please GCC 5.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D72924

Files:
  mlir/lib/Dialect/SPIRV/SPIRVLowering.cpp
  mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp


Index: mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp
===================================================================
--- mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp
+++ mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp
@@ -1305,7 +1305,7 @@
       continue;
 
     os << "  case Capability::" << enumerant.getSymbol()
-       << ": {static Capability implies[] = {";
+       << ": {static const Capability implies[] = {";
     std::vector<Record *> impliedCapsDefs = def.getValueAsListOfDefs("implies");
     mlir::interleaveComma(impliedCapsDefs, os, [&](const Record *capDef) {
       os << "Capability::" << EnumAttrCase(capDef).getSymbol();
Index: mlir/lib/Dialect/SPIRV/SPIRVLowering.cpp
===================================================================
--- mlir/lib/Dialect/SPIRV/SPIRVLowering.cpp
+++ mlir/lib/Dialect/SPIRV/SPIRVLowering.cpp
@@ -318,4 +318,4 @@
   }
 
   return true;
-};
+}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72924.238772.patch
Type: text/x-patch
Size: 888 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200117/66a71cdf/attachment.bin>