Split semantics into check and sem_ir directories (#3176)

Continuing along with #3070. Note this is just a file rename, with BUILD
edits; every file previously in semantics/ should show as moved (except
maybe BUILDs, which split).

toolchain/autoupdate_testdata.py

@@ -12,12 +12,12 @@ import argparse
 import subprocess
 
 TARGETS = {
+    "check": "//toolchain/check:check_file_test",
     "codegen": "//toolchain/codegen:codegen_file_test",
     "driver": "//toolchain/driver:driver_file_test",
     "lexer": "//toolchain/lexer:lexer_file_test",
     "lower": "//toolchain/lower:lower_file_test",
     "parser": "//toolchain/parser:parse_tree_file_test",
-    "semantics": "//toolchain/semantics:semantics_file_test",
 }
 
 

toolchain/check/BUILD

@@ -0,0 +1,106 @@
+# Part of the Carbon Language project, under the Apache License v2.0 with LLVM
+# Exceptions. See /LICENSE for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+load("@rules_cc//cc:defs.bzl", "cc_library")
+load("//bazel/sh_run:rules.bzl", "glob_sh_run")
+load("//testing/file_test:rules.bzl", "file_test")
+load("//testing/fuzzing:rules.bzl", "cc_fuzz_test")
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "node_stack",
+    srcs = ["node_stack.cpp"],
+    hdrs = ["node_stack.h"],
+    deps = [
+        "//common:check",
+        "//common:ostream",
+        "//common:vlog",
+        "//toolchain/parser:parse_node_kind",
+        "//toolchain/parser:parse_tree",
+        "//toolchain/sem_ir:node",
+        "@llvm-project//llvm:Support",
+    ],
+)
+
+cc_library(
+    name = "check",
+    srcs = [
+        "check.cpp",
+        "context.cpp",
+        "declaration_name_stack.cpp",
+        "node_block_stack.cpp",
+    ] +
+    # Glob handler files to avoid missing any.
+    glob([
+        "handle*.cpp",
+    ]),
+    hdrs = [
+        "check.h",
+        "context.h",
+        "declaration_name_stack.h",
+        "node_block_stack.h",
+    ],
+    deps = [
+        ":node_stack",
+        "//common:check",
+        "//common:ostream",
+        "//common:vlog",
+        "//toolchain/base:pretty_stack_trace_function",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:diagnostic_kind",
+        "//toolchain/lexer:tokenized_buffer",
+        "//toolchain/parser:parse_node_kind",
+        "//toolchain/parser:parse_tree",
+        "//toolchain/parser:parse_tree_node_location_translator",
+        "//toolchain/sem_ir:builtin_kind",
+        "//toolchain/sem_ir:file",
+        "//toolchain/sem_ir:node",
+        "//toolchain/sem_ir:node_kind",
+        "@llvm-project//llvm:Support",
+    ],
+)
+
+file_test(
+    name = "check_file_test",
+    srcs = ["check_file_test.cpp"],
+    tests = glob(["testdata/**/*.carbon"]),
+    deps = [
+        "//toolchain/driver:driver_file_test_base",
+        "@llvm-project//llvm:Support",
+    ],
+)
+
+cc_fuzz_test(
+    name = "check_fuzzer",
+    size = "small",
+    srcs = ["check_fuzzer.cpp"],
+    corpus = glob(["fuzzer_corpus/*"]),
+    deps = [
+        "//toolchain/driver",
+        "@llvm-project//llvm:Support",
+    ],
+)
+
+glob_sh_run(
+    args = [
+        "$(location //toolchain/driver:carbon)",
+        "dump",
+        "semantics-ir",
+    ],
+    data = ["//toolchain/driver:carbon"],
+    file_exts = ["carbon"],
+)
+
+glob_sh_run(
+    args = [
+        "$(location //toolchain/driver:carbon)",
+        "-v",
+        "dump",
+        "semantics-ir",
+    ],
+    data = ["//toolchain/driver:carbon"],
+    file_exts = ["carbon"],
+    run_ext = "verbose",
+)

toolchain/semantics/check.cpp → toolchain/check/check.cpp

@@ -5,9 +5,9 @@
 #include "common/check.h"
 
 #include "toolchain/base/pretty_stack_trace_function.h"
+#include "toolchain/check/context.h"
 #include "toolchain/parser/parse_tree_node_location_translator.h"
-#include "toolchain/semantics/semantics_context.h"
-#include "toolchain/semantics/semantics_ir.h"
+#include "toolchain/sem_ir/file.h"
 
 namespace Carbon::Check {
 

toolchain/semantics/check.h → toolchain/check/check.h

@@ -2,14 +2,14 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CARBON_TOOLCHAIN_SEMANTICS_CHECK_H_
-#define CARBON_TOOLCHAIN_SEMANTICS_CHECK_H_
+#ifndef CARBON_TOOLCHAIN_CHECK_CHECK_H_
+#define CARBON_TOOLCHAIN_CHECK_CHECK_H_
 
 #include "common/ostream.h"
 #include "toolchain/diagnostics/diagnostic_emitter.h"
 #include "toolchain/lexer/tokenized_buffer.h"
 #include "toolchain/parser/parse_tree.h"
-#include "toolchain/semantics/semantics_ir.h"
+#include "toolchain/sem_ir/file.h"
 
 namespace Carbon::Check {
 
@@ -26,4 +26,4 @@ extern auto CheckParseTree(const SemIR::File& builtin_ir,
 
 }  // namespace Carbon::Check
 
-#endif  // CARBON_TOOLCHAIN_SEMANTICS_CHECK_H_
+#endif  // CARBON_TOOLCHAIN_CHECK_CHECK_H_

toolchain/semantics/semantics_context.cpp → toolchain/check/context.cpp

@@ -2,21 +2,21 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "toolchain/semantics/semantics_context.h"
+#include "toolchain/check/context.h"
 
 #include <utility>
 
 #include "common/check.h"
 #include "common/vlog.h"
 #include "llvm/ADT/STLExtras.h"
+#include "toolchain/check/declaration_name_stack.h"
+#include "toolchain/check/node_block_stack.h"
 #include "toolchain/diagnostics/diagnostic_kind.h"
 #include "toolchain/lexer/tokenized_buffer.h"
 #include "toolchain/parser/parse_node_kind.h"
-#include "toolchain/semantics/semantics_declaration_name_stack.h"
-#include "toolchain/semantics/semantics_ir.h"
-#include "toolchain/semantics/semantics_node.h"
-#include "toolchain/semantics/semantics_node_block_stack.h"
-#include "toolchain/semantics/semantics_node_kind.h"
+#include "toolchain/sem_ir/file.h"
+#include "toolchain/sem_ir/node.h"
+#include "toolchain/sem_ir/node_kind.h"
 
 namespace Carbon::Check {
 

toolchain/semantics/semantics_context.h → toolchain/check/context.h

@@ -2,19 +2,19 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CARBON_TOOLCHAIN_SEMANTICS_SEMANTICS_CONTEXT_H_
-#define CARBON_TOOLCHAIN_SEMANTICS_SEMANTICS_CONTEXT_H_
+#ifndef CARBON_TOOLCHAIN_CHECK_CONTEXT_H_
+#define CARBON_TOOLCHAIN_CHECK_CONTEXT_H_
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/SmallVector.h"
+#include "toolchain/check/declaration_name_stack.h"
+#include "toolchain/check/node_block_stack.h"
+#include "toolchain/check/node_stack.h"
 #include "toolchain/parser/parse_tree.h"
-#include "toolchain/semantics/semantics_declaration_name_stack.h"
-#include "toolchain/semantics/semantics_ir.h"
-#include "toolchain/semantics/semantics_node.h"
-#include "toolchain/semantics/semantics_node_block_stack.h"
-#include "toolchain/semantics/semantics_node_stack.h"
+#include "toolchain/sem_ir/file.h"
+#include "toolchain/sem_ir/node.h"
 
 namespace Carbon::Check {
 
@@ -403,4 +403,4 @@ class Context {
 
 }  // namespace Carbon::Check
 
-#endif  // CARBON_TOOLCHAIN_SEMANTICS_SEMANTICS_CONTEXT_H_
+#endif  // CARBON_TOOLCHAIN_CHECK_CONTEXT_H_

toolchain/semantics/semantics_declaration_name_stack.cpp → toolchain/check/declaration_name_stack.cpp

@@ -2,9 +2,9 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "toolchain/semantics/semantics_declaration_name_stack.h"
+#include "toolchain/check/declaration_name_stack.h"
 
-#include "toolchain/semantics/semantics_context.h"
+#include "toolchain/check/context.h"
 
 namespace Carbon::Check {
 

toolchain/semantics/semantics_declaration_name_stack.h → toolchain/check/declaration_name_stack.h

@@ -2,12 +2,12 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CARBON_TOOLCHAIN_SEMANTICS_SEMANTICS_DECLARATION_NAME_STACK_H_
-#define CARBON_TOOLCHAIN_SEMANTICS_SEMANTICS_DECLARATION_NAME_STACK_H_
+#ifndef CARBON_TOOLCHAIN_CHECK_DECLARATION_NAME_STACK_H_
+#define CARBON_TOOLCHAIN_CHECK_DECLARATION_NAME_STACK_H_
 
 #include "llvm/ADT/SmallVector.h"
 #include "toolchain/parser/parse_tree.h"
-#include "toolchain/semantics/semantics_node.h"
+#include "toolchain/sem_ir/node.h"
 
 namespace Carbon::Check {
 
@@ -136,4 +136,4 @@ class DeclarationNameStack {
 
 }  // namespace Carbon::Check
 
-#endif  // CARBON_TOOLCHAIN_SEMANTICS_SEMANTICS_DECLARATION_NAME_STACK_H_
+#endif  // CARBON_TOOLCHAIN_CHECK_DECLARATION_NAME_STACK_H_