Merge commit '859e379ffbbb' from llvm.org/master into apple/master

Author: git apple-llvm automerger

mlir/tools/mlir-tblgen/SPIRVUtilsGen.cpp

@@ -1304,9 +1304,10 @@ static bool emitCapabilityImplication(const RecordKeeper &recordKeeper,
     if (!def.getValue("implies"))
       continue;
 
-    os << "  case Capability::" << enumerant.getSymbol()
-       << ": {static const Capability implies[] = {";
     std::vector<Record *> impliedCapsDefs = def.getValueAsListOfDefs("implies");
+    os << "  case Capability::" << enumerant.getSymbol()
+       << ": {static const Capability implies[" << impliedCapsDefs.size()
+       << "] = {";
     mlir::interleaveComma(impliedCapsDefs, os, [&](const Record *capDef) {
       os << "Capability::" << EnumAttrCase(capDef).getSymbol();
     });