From 5fbf9974e1543ab50dc5c89a6fc6ea6b7ed0c5b4 Mon Sep 17 00:00:00 2001
From: Schuyler Eldridge <schuyler.eldridge@sifive.com>
Date: Wed, 8 Sep 2021 17:26:48 -0400
Subject: [PATCH] [Calyx] Remove C++20 Features, NFC

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
---
 include/circt/Dialect/Calyx/CalyxInterfaces.td | 8 ++++----
 lib/Dialect/Calyx/CalyxOps.cpp                 | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/circt/Dialect/Calyx/CalyxInterfaces.td b/include/circt/Dialect/Calyx/CalyxInterfaces.td
index af2c4fa90e..6408aed141 100644
--- a/include/circt/Dialect/Calyx/CalyxInterfaces.td
+++ b/include/circt/Dialect/Calyx/CalyxInterfaces.td
@@ -95,10 +95,10 @@ def CellOpInterface : OpInterface<"CellInterface"> {
         auto zip = llvm::zip($_op->getResults(), $_op.portDirections(), $_op.portNames());
         for (auto&& [result, direction, name] : zip)
           info.push_back(PortInfo{
-              .name=StringAttr::get($_op->getContext(), name),
-              .type=result.getType(),
-              .direction=direction,
-              .attributes=DictionaryAttr()
+              StringAttr::get($_op->getContext(), name),
+              result.getType(),
+              direction,
+              DictionaryAttr()
           });
         return info;
     }]
diff --git a/lib/Dialect/Calyx/CalyxOps.cpp b/lib/Dialect/Calyx/CalyxOps.cpp
index c034d6863f..f37bad5b60 100644
--- a/lib/Dialect/Calyx/CalyxOps.cpp
+++ b/lib/Dialect/Calyx/CalyxOps.cpp
@@ -284,11 +284,10 @@ SmallVector<PortInfo> ComponentOp::getPortInfo() {
 
   SmallVector<PortInfo> results;
   for (uint64_t i = 0, e = portNamesAttr.size(); i != e; ++i) {
-    results.push_back(
-        PortInfo{.name = portNamesAttr[i].cast<StringAttr>(),
-                 .type = portTypes[i],
-                 .direction = direction::get(portDirectionsAttr.getValue()[i]),
-                 .attributes = portAttrs[i].cast<DictionaryAttr>()});
+    results.push_back(PortInfo{portNamesAttr[i].cast<StringAttr>(),
+                               portTypes[i],
+                               direction::get(portDirectionsAttr.getValue()[i]),
+                               portAttrs[i].cast<DictionaryAttr>()});
   }
   return results;
 }