Instantiate templates when CLI is invoked with -fcheck

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

scripts/update-tests.mjs

@@ -51,12 +51,8 @@ async function updateTest(unitTestPath) {
 
   const fcheck = sourceLines[index]?.includes("-fcheck") ? "-fcheck" : "";
 
-  const ftemplates = sourceLines[index]?.includes("-ftemplates")
-    ? "-ftemplates"
-    : "";
-
   const ast =
-    await $`${cxx} -verify -ast-dump ${unitTestPath} ${fcheck} ${ftemplates}`.quiet();
+    await $`${cxx} -verify -ast-dump ${unitTestPath} ${fcheck}`.quiet();
 
   const lines = ast.stdout.split("\n");
 

src/frontend/cxx/frontend.cc

@@ -316,7 +316,6 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
         .fuzzyTemplateResolution = true,
         .staticAssert = cli.opt_fstatic_assert || cli.opt_fcheck,
         .reflect = !cli.opt_fno_reflect,
-        .templates = cli.opt_ftemplates,
     });
 
     if (cli.opt_freport_missing_types) {

src/lsp/cxx/lsp/cxx_document.cc

@@ -273,7 +273,6 @@ void CxxDocument::parse(std::string source) {
       .fuzzyTemplateResolution = true,
       .staticAssert = cli.opt_fstatic_assert || cli.opt_fcheck,
       .reflect = !cli.opt_fno_reflect,
-      .templates = cli.opt_ftemplates,
       .stopParsingPredicate = stopParsingPredicate,
       .complete = complete,
   });

src/parser/cxx/cli.cc

@@ -149,8 +149,6 @@ std::vector<CLIOptionDescr> options{
     {"-fstatic-assert", "Enable static asserts", &CLI::opt_fstatic_assert,
      CLIOptionVisibility::kExperimental},
 
-    {"-ftemplates", "Enable templates (WIP)", &CLI::opt_ftemplates},
-
     {"-freport-missing-types", "Report missing types",
      &CLI::opt_freport_missing_types},
 

src/parser/cxx/cli.h

@@ -68,7 +68,6 @@ class CLI {
   bool opt_fsyntax_only = false;
   bool opt_fstatic_assert = false;
   bool opt_fcheck = false;
-  bool opt_ftemplates = false;
   bool opt_freport_missing_types = false;
   bool opt_fno_reflect = false;
   bool opt_verify = false;

src/parser/cxx/parser.cc

@@ -5807,7 +5807,7 @@ auto Parser::parse_complex_type_specifier(SpecifierAST*& yyast,
 }
 
 auto Parser::instantiate(SimpleTemplateIdAST* templateId) -> Symbol* {
-  if (!config_.templates) return nullptr;
+  if (!config_.checkTypes) return nullptr;
 
   std::vector<TemplateArgument> args;
   for (auto it = templateId->templateArgumentList; it; it = it->next) {

src/parser/cxx/parser_fwd.h

@@ -49,7 +49,6 @@ struct ParserConfiguration {
   bool fuzzyTemplateResolution = false;
   bool staticAssert = false;
   bool reflect = true;
-  bool templates = false;
   std::function<bool()> stopParsingPredicate;
   std::function<void(const CodeCompletionContext&)> complete;
 };

tests/unit_tests/sema/template_alias_01.cc

@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -ftemplates -dump-symbols %s | %filecheck %s
+// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
 
 template <typename T>
 using Pointer = T*;

tests/unit_tests/sema/template_alias_02.cc

@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -ftemplates -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
 
 template <typename Key, typename Value>
 struct HashMap {

tests/unit_tests/sema/template_class_01.cc

@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -ftemplates -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct A {