irgen: Generate explicit instantiations

- explicit instantiations for all Vector and IndexedVector used in any .def file
p4lang · May 27, 2024 · 7b6da8a · 7b6da8a
1 parent ce5cb8c
commit 7b6da8a
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/tools/ir-generator/irclass.cpp b/tools/ir-generator/irclass.cpp
@@ -156,8 +156,6 @@ void IrDefinitions::generate(std::ostream &t, std::ostream &out, std::ostream &i
         e->generate_impl(impl);
     }
 
-    out << "#endif /* " << macroname << " */" << std::endl;
-
     ///////////////////////////////// tree
 
     t << "#pragma once\n"
@@ -174,13 +172,22 @@ void IrDefinitions::generate(std::ostream &t, std::ostream &out, std::ostream &i
          "D(Vector<IR::Node>) "
          "B(Node), ##__VA_ARGS__) \\"
       << std::endl;
+    impl << "template class IR::Vector<IR::Node>;" << std::endl;
+    out << "extern template class IR::Vector<IR::Node>;" << std::endl;
+    impl << "template class IR::IndexedVector<IR::Node>;" << std::endl;
+    out << "extern template class IR::IndexedVector<IR::Node>;" << std::endl;
     for (auto cls : *getClasses()) {
-        if (cls->needVector || cls->needIndexedVector)
+        if (cls->needVector || cls->needIndexedVector) {
             t << "T(Vector<IR::" << cls->containedIn << cls->name
               << ">, D(Node), "
                  "##__VA_ARGS__) \\"
               << std::endl;
-        if (cls->needIndexedVector)
+            impl << "template class IR::Vector<IR::" << cls->containedIn << cls->name
+                 << ">;" << std::endl;
+            out << "extern template class IR::Vector<IR::" << cls->containedIn << cls->name
+                << ">;" << std::endl;
+        }
+        if (cls->needIndexedVector) {
             // We generate IndexedVector only if needed; we expect users won't use
             // these if they don't want to place them in fields.
             t << "T(IndexedVector<IR::" << cls->containedIn << cls->name
@@ -190,6 +197,11 @@ void IrDefinitions::generate(std::ostream &t, std::ostream &out, std::ostream &i
               << ">) "
                  "B(Node), ##__VA_ARGS__) \\"
               << std::endl;
+            impl << "template class IR::IndexedVector<IR::" << cls->containedIn << cls->name
+                 << ">;" << std::endl;
+            out << "extern template class IR::IndexedVector<IR::" << cls->containedIn << cls->name
+                << ">;" << std::endl;
+        }
         if (cls->needNameMap) BUG("visitable (non-inline) NameMap not yet implemented");
         if (cls->needNodeMap) BUG("visitable (non-inline) NodeMap not yet implemented");
     }
@@ -247,6 +259,8 @@ void IrDefinitions::generate(std::ostream &t, std::ostream &out, std::ostream &i
       << " inline bool operator!=(NodeDiscriminator lhs, RTTI::TypeId rhs) { return "
          "RTTI::TypeId(lhs) != rhs; }\n";
     t << "}  // namespace IR" << std::endl;
+
+    out << "#endif /* " << macroname << " */" << std::endl;
 }
 
 void IrClass::generateTreeMacro(std::ostream &out) const {