diff --git a/toolchain/autoupdate_testdata.py b/toolchain/autoupdate_testdata.py index 6b2d20f56847..5ed110f73f90 100755 --- a/toolchain/autoupdate_testdata.py +++ b/toolchain/autoupdate_testdata.py @@ -15,7 +15,7 @@ TARGETS = { "codegen": "//toolchain/codegen:codegen_file_test", "driver": "//toolchain/driver:driver_file_test", "lexer": "//toolchain/lexer:lexer_file_test", - "lowering": "//toolchain/lowering:lowering_file_test", + "lower": "//toolchain/lower:lower_file_test", "parser": "//toolchain/parser:parse_tree_file_test", "semantics": "//toolchain/semantics:semantics_file_test", } diff --git a/toolchain/driver/BUILD b/toolchain/driver/BUILD index c14de157fdae..955e28fcafe4 100644 --- a/toolchain/driver/BUILD +++ b/toolchain/driver/BUILD @@ -21,7 +21,7 @@ cc_library( "//toolchain/diagnostics:diagnostic_emitter", "//toolchain/diagnostics:sorting_diagnostic_consumer", "//toolchain/lexer:tokenized_buffer", - "//toolchain/lowering:lower_to_llvm", + "//toolchain/lower", "//toolchain/parser:parse_tree", "//toolchain/semantics:semantics_ir", "//toolchain/semantics:semantics_ir_formatter", diff --git a/toolchain/driver/driver.cpp b/toolchain/driver/driver.cpp index 0621982cd1b9..c182c704b4c1 100644 --- a/toolchain/driver/driver.cpp +++ b/toolchain/driver/driver.cpp @@ -16,7 +16,7 @@ #include "toolchain/diagnostics/diagnostic_emitter.h" #include "toolchain/diagnostics/sorting_diagnostic_consumer.h" #include "toolchain/lexer/tokenized_buffer.h" -#include "toolchain/lowering/lower_to_llvm.h" +#include "toolchain/lower/lower.h" #include "toolchain/parser/parse_tree.h" #include "toolchain/semantics/semantics_ir.h" #include "toolchain/semantics/semantics_ir_formatter.h" diff --git a/toolchain/lowering/BUILD b/toolchain/lower/BUILD similarity index 79% rename from toolchain/lowering/BUILD rename to toolchain/lower/BUILD index bb6908d4bc59..274b0590c652 100644 --- a/toolchain/lowering/BUILD +++ b/toolchain/lower/BUILD @@ -9,11 +9,11 @@ load("//testing/file_test:rules.bzl", "file_test") package(default_visibility = ["//visibility:public"]) cc_library( - name = "lower_to_llvm", - srcs = ["lower_to_llvm.cpp"], - hdrs = ["lower_to_llvm.h"], + name = "lower", + srcs = ["lower.cpp"], + hdrs = ["lower.h"], deps = [ - ":lowering_context", + ":context", "//toolchain/semantics:semantics_ir", "@llvm-project//llvm:Core", "@llvm-project//llvm:Support", @@ -21,18 +21,18 @@ cc_library( ) cc_library( - name = "lowering_context", + name = "context", srcs = [ - "lowering_context.cpp", - "lowering_function_context.cpp", + "file_context.cpp", + "function_context.cpp", ] + # Glob handler files to avoid missing any. glob([ - "lowering_handle*.cpp", + "handle*.cpp", ]), hdrs = [ - "lowering_context.h", - "lowering_function_context.h", + "file_context.h", + "function_context.h", ], deps = [ "//common:check", @@ -46,8 +46,8 @@ cc_library( ) file_test( - name = "lowering_file_test", - srcs = ["lowering_file_test.cpp"], + name = "lower_file_test", + srcs = ["lower_file_test.cpp"], tests = glob(["testdata/**/*.carbon"]), deps = [ "//toolchain/driver:driver_file_test_base", diff --git a/toolchain/lowering/__init__.py b/toolchain/lower/__init__.py similarity index 100% rename from toolchain/lowering/__init__.py rename to toolchain/lower/__init__.py diff --git a/toolchain/lowering/lowering_context.cpp b/toolchain/lower/file_context.cpp similarity index 98% rename from toolchain/lowering/lowering_context.cpp rename to toolchain/lower/file_context.cpp index 3a7f552f581f..82c6839650ea 100644 --- a/toolchain/lowering/lowering_context.cpp +++ b/toolchain/lower/file_context.cpp @@ -2,12 +2,12 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/lowering/lowering_context.h" +#include "toolchain/lower/file_context.h" #include "common/vlog.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Sequence.h" -#include "toolchain/lowering/lowering_function_context.h" +#include "toolchain/lower/function_context.h" #include "toolchain/semantics/semantics_ir.h" #include "toolchain/semantics/semantics_node.h" #include "toolchain/semantics/semantics_node_kind.h" @@ -26,7 +26,7 @@ FileContext::FileContext(llvm::LLVMContext& llvm_context, << "Generating LLVM IR from invalid SemIR::File is unsupported."; } -// TODO: Move this to lower_to_llvm.cpp. +// TODO: Move this to lower.cpp. auto FileContext::Run() -> std::unique_ptr { CARBON_CHECK(llvm_module_) << "Run can only be called once."; diff --git a/toolchain/lowering/lowering_context.h b/toolchain/lower/file_context.h similarity index 95% rename from toolchain/lowering/lowering_context.h rename to toolchain/lower/file_context.h index 13eccea54f91..f1e55cdcbb98 100644 --- a/toolchain/lowering/lowering_context.h +++ b/toolchain/lower/file_context.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_LOWERING_LOWERING_CONTEXT_H_ -#define CARBON_TOOLCHAIN_LOWERING_LOWERING_CONTEXT_H_ +#ifndef CARBON_TOOLCHAIN_LOWER_FILE_CONTEXT_H_ +#define CARBON_TOOLCHAIN_LOWER_FILE_CONTEXT_H_ #include "llvm/IR/Constants.h" #include "llvm/IR/LLVMContext.h" @@ -96,4 +96,4 @@ class FileContext { } // namespace Carbon::Lower -#endif // CARBON_TOOLCHAIN_LOWERING_LOWERING_CONTEXT_H_ +#endif // CARBON_TOOLCHAIN_LOWER_FILE_CONTEXT_H_ diff --git a/toolchain/lowering/lowering_function_context.cpp b/toolchain/lower/function_context.cpp similarity index 98% rename from toolchain/lowering/lowering_function_context.cpp rename to toolchain/lower/function_context.cpp index 7ae3f3ed47b3..9ac0a15e9900 100644 --- a/toolchain/lowering/lowering_function_context.cpp +++ b/toolchain/lower/function_context.cpp @@ -2,7 +2,7 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/lowering/lowering_function_context.h" +#include "toolchain/lower/function_context.h" #include "toolchain/semantics/semantics_ir.h" diff --git a/toolchain/lowering/lowering_function_context.h b/toolchain/lower/function_context.h similarity index 95% rename from toolchain/lowering/lowering_function_context.h rename to toolchain/lower/function_context.h index b906643dddcd..492904852dd2 100644 --- a/toolchain/lowering/lowering_function_context.h +++ b/toolchain/lower/function_context.h @@ -2,13 +2,13 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_LOWERING_LOWERING_FUNCTION_CONTEXT_H_ -#define CARBON_TOOLCHAIN_LOWERING_LOWERING_FUNCTION_CONTEXT_H_ +#ifndef CARBON_TOOLCHAIN_LOWER_FUNCTION_CONTEXT_H_ +#define CARBON_TOOLCHAIN_LOWER_FUNCTION_CONTEXT_H_ #include "llvm/IR/IRBuilder.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" -#include "toolchain/lowering/lowering_context.h" +#include "toolchain/lower/file_context.h" #include "toolchain/semantics/semantics_ir.h" #include "toolchain/semantics/semantics_node.h" @@ -146,4 +146,4 @@ class FunctionContext { } // namespace Carbon::Lower -#endif // CARBON_TOOLCHAIN_LOWERING_LOWERING_FUNCTION_CONTEXT_H_ +#endif // CARBON_TOOLCHAIN_LOWER_FUNCTION_CONTEXT_H_ diff --git a/toolchain/lowering/lowering_handle.cpp b/toolchain/lower/handle.cpp similarity index 99% rename from toolchain/lowering/lowering_handle.cpp rename to toolchain/lower/handle.cpp index 29658c8b528d..b0e47d34e12c 100644 --- a/toolchain/lowering/lowering_handle.cpp +++ b/toolchain/lower/handle.cpp @@ -4,7 +4,7 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Sequence.h" -#include "toolchain/lowering/lowering_function_context.h" +#include "toolchain/lower/function_context.h" #include "toolchain/semantics/semantics_node_kind.h" namespace Carbon::Lower { diff --git a/toolchain/lowering/lowering_handle_expression_category.cpp b/toolchain/lower/handle_expression_category.cpp similarity index 97% rename from toolchain/lowering/lowering_handle_expression_category.cpp rename to toolchain/lower/handle_expression_category.cpp index a84574452ba8..ff78ec28c77c 100644 --- a/toolchain/lowering/lowering_handle_expression_category.cpp +++ b/toolchain/lower/handle_expression_category.cpp @@ -2,7 +2,7 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/lowering/lowering_function_context.h" +#include "toolchain/lower/function_context.h" namespace Carbon::Lower { diff --git a/toolchain/lowering/lowering_handle_type.cpp b/toolchain/lower/handle_type.cpp similarity index 95% rename from toolchain/lowering/lowering_handle_type.cpp rename to toolchain/lower/handle_type.cpp index 2a42d4625206..ffb4bc1548f6 100644 --- a/toolchain/lowering/lowering_handle_type.cpp +++ b/toolchain/lower/handle_type.cpp @@ -2,7 +2,7 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/lowering/lowering_function_context.h" +#include "toolchain/lower/function_context.h" namespace Carbon::Lower { diff --git a/toolchain/lowering/lower_to_llvm.cpp b/toolchain/lower/lower.cpp similarity index 85% rename from toolchain/lowering/lower_to_llvm.cpp rename to toolchain/lower/lower.cpp index cb13544f746b..07b5d3e8bfc8 100644 --- a/toolchain/lowering/lower_to_llvm.cpp +++ b/toolchain/lower/lower.cpp @@ -2,9 +2,9 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/lowering/lower_to_llvm.h" +#include "toolchain/lower/lower.h" -#include "toolchain/lowering/lowering_context.h" +#include "toolchain/lower/file_context.h" namespace Carbon::Lower { diff --git a/toolchain/lowering/lower_to_llvm.h b/toolchain/lower/lower.h similarity index 79% rename from toolchain/lowering/lower_to_llvm.h rename to toolchain/lower/lower.h index 5f0958fe5e09..0448b67f2496 100644 --- a/toolchain/lowering/lower_to_llvm.h +++ b/toolchain/lower/lower.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_LOWERING_LOWER_TO_LLVM_H_ -#define CARBON_TOOLCHAIN_LOWERING_LOWER_TO_LLVM_H_ +#ifndef CARBON_TOOLCHAIN_LOWER_LOWER_H_ +#define CARBON_TOOLCHAIN_LOWER_LOWER_H_ #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" @@ -19,4 +19,4 @@ auto LowerToLLVM(llvm::LLVMContext& llvm_context, llvm::StringRef module_name, } // namespace Carbon::Lower -#endif // CARBON_TOOLCHAIN_LOWERING_LOWER_TO_LLVM_H_ +#endif // CARBON_TOOLCHAIN_LOWER_LOWER_H_ diff --git a/toolchain/lowering/lowering_file_test.cpp b/toolchain/lower/lower_file_test.cpp similarity index 100% rename from toolchain/lowering/lowering_file_test.cpp rename to toolchain/lower/lower_file_test.cpp diff --git a/toolchain/lowering/testdata/array/assign_return_value.carbon b/toolchain/lower/testdata/array/assign_return_value.carbon similarity index 100% rename from toolchain/lowering/testdata/array/assign_return_value.carbon rename to toolchain/lower/testdata/array/assign_return_value.carbon diff --git a/toolchain/lowering/testdata/array/base.carbon b/toolchain/lower/testdata/array/base.carbon similarity index 100% rename from toolchain/lowering/testdata/array/base.carbon rename to toolchain/lower/testdata/array/base.carbon diff --git a/toolchain/lowering/testdata/basics/empty.carbon b/toolchain/lower/testdata/basics/empty.carbon similarity index 100% rename from toolchain/lowering/testdata/basics/empty.carbon rename to toolchain/lower/testdata/basics/empty.carbon diff --git a/toolchain/lowering/testdata/basics/fail_before_lowering.carbon b/toolchain/lower/testdata/basics/fail_before_lowering.carbon similarity index 100% rename from toolchain/lowering/testdata/basics/fail_before_lowering.carbon rename to toolchain/lower/testdata/basics/fail_before_lowering.carbon diff --git a/toolchain/lowering/testdata/basics/false_true.carbon b/toolchain/lower/testdata/basics/false_true.carbon similarity index 100% rename from toolchain/lowering/testdata/basics/false_true.carbon rename to toolchain/lower/testdata/basics/false_true.carbon diff --git a/toolchain/lowering/testdata/basics/type_values.carbon b/toolchain/lower/testdata/basics/type_values.carbon similarity index 100% rename from toolchain/lowering/testdata/basics/type_values.carbon rename to toolchain/lower/testdata/basics/type_values.carbon diff --git a/toolchain/lowering/testdata/basics/zero.carbon b/toolchain/lower/testdata/basics/zero.carbon similarity index 100% rename from toolchain/lowering/testdata/basics/zero.carbon rename to toolchain/lower/testdata/basics/zero.carbon diff --git a/toolchain/lowering/testdata/function/call/empty_struct.carbon b/toolchain/lower/testdata/function/call/empty_struct.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/empty_struct.carbon rename to toolchain/lower/testdata/function/call/empty_struct.carbon diff --git a/toolchain/lowering/testdata/function/call/empty_tuple.carbon b/toolchain/lower/testdata/function/call/empty_tuple.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/empty_tuple.carbon rename to toolchain/lower/testdata/function/call/empty_tuple.carbon diff --git a/toolchain/lowering/testdata/function/call/i32.carbon b/toolchain/lower/testdata/function/call/i32.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/i32.carbon rename to toolchain/lower/testdata/function/call/i32.carbon diff --git a/toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon b/toolchain/lower/testdata/function/call/implicit_empty_tuple_as_arg.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon rename to toolchain/lower/testdata/function/call/implicit_empty_tuple_as_arg.carbon diff --git a/toolchain/lowering/testdata/function/call/params_one.carbon b/toolchain/lower/testdata/function/call/params_one.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/params_one.carbon rename to toolchain/lower/testdata/function/call/params_one.carbon diff --git a/toolchain/lowering/testdata/function/call/params_one_comma.carbon b/toolchain/lower/testdata/function/call/params_one_comma.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/params_one_comma.carbon rename to toolchain/lower/testdata/function/call/params_one_comma.carbon diff --git a/toolchain/lowering/testdata/function/call/params_two.carbon b/toolchain/lower/testdata/function/call/params_two.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/params_two.carbon rename to toolchain/lower/testdata/function/call/params_two.carbon diff --git a/toolchain/lowering/testdata/function/call/params_two_comma.carbon b/toolchain/lower/testdata/function/call/params_two_comma.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/params_two_comma.carbon rename to toolchain/lower/testdata/function/call/params_two_comma.carbon diff --git a/toolchain/lowering/testdata/function/call/params_zero.carbon b/toolchain/lower/testdata/function/call/params_zero.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/params_zero.carbon rename to toolchain/lower/testdata/function/call/params_zero.carbon diff --git a/toolchain/lowering/testdata/function/call/return_implicit.carbon b/toolchain/lower/testdata/function/call/return_implicit.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/return_implicit.carbon rename to toolchain/lower/testdata/function/call/return_implicit.carbon diff --git a/toolchain/lowering/testdata/function/call/struct_param.carbon b/toolchain/lower/testdata/function/call/struct_param.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/struct_param.carbon rename to toolchain/lower/testdata/function/call/struct_param.carbon diff --git a/toolchain/lowering/testdata/function/call/tuple_param.carbon b/toolchain/lower/testdata/function/call/tuple_param.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/tuple_param.carbon rename to toolchain/lower/testdata/function/call/tuple_param.carbon diff --git a/toolchain/lowering/testdata/function/call/tuple_param_with_return_slot.carbon b/toolchain/lower/testdata/function/call/tuple_param_with_return_slot.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/tuple_param_with_return_slot.carbon rename to toolchain/lower/testdata/function/call/tuple_param_with_return_slot.carbon diff --git a/toolchain/lowering/testdata/function/call/var_param.carbon b/toolchain/lower/testdata/function/call/var_param.carbon similarity index 100% rename from toolchain/lowering/testdata/function/call/var_param.carbon rename to toolchain/lower/testdata/function/call/var_param.carbon diff --git a/toolchain/lowering/testdata/function/declaration/simple.carbon b/toolchain/lower/testdata/function/declaration/simple.carbon similarity index 100% rename from toolchain/lowering/testdata/function/declaration/simple.carbon rename to toolchain/lower/testdata/function/declaration/simple.carbon diff --git a/toolchain/lowering/testdata/function/definition/empty_struct.carbon b/toolchain/lower/testdata/function/definition/empty_struct.carbon similarity index 100% rename from toolchain/lowering/testdata/function/definition/empty_struct.carbon rename to toolchain/lower/testdata/function/definition/empty_struct.carbon diff --git a/toolchain/lowering/testdata/function/definition/params_one.carbon b/toolchain/lower/testdata/function/definition/params_one.carbon similarity index 100% rename from toolchain/lowering/testdata/function/definition/params_one.carbon rename to toolchain/lower/testdata/function/definition/params_one.carbon diff --git a/toolchain/lowering/testdata/function/definition/params_two.carbon b/toolchain/lower/testdata/function/definition/params_two.carbon similarity index 100% rename from toolchain/lowering/testdata/function/definition/params_two.carbon rename to toolchain/lower/testdata/function/definition/params_two.carbon diff --git a/toolchain/lowering/testdata/function/definition/params_zero.carbon b/toolchain/lower/testdata/function/definition/params_zero.carbon similarity index 100% rename from toolchain/lowering/testdata/function/definition/params_zero.carbon rename to toolchain/lower/testdata/function/definition/params_zero.carbon diff --git a/toolchain/lowering/testdata/if/else.carbon b/toolchain/lower/testdata/if/else.carbon similarity index 100% rename from toolchain/lowering/testdata/if/else.carbon rename to toolchain/lower/testdata/if/else.carbon diff --git a/toolchain/lowering/testdata/if/no_else.carbon b/toolchain/lower/testdata/if/no_else.carbon similarity index 100% rename from toolchain/lowering/testdata/if/no_else.carbon rename to toolchain/lower/testdata/if/no_else.carbon diff --git a/toolchain/lowering/testdata/if_expression/basic.carbon b/toolchain/lower/testdata/if_expression/basic.carbon similarity index 100% rename from toolchain/lowering/testdata/if_expression/basic.carbon rename to toolchain/lower/testdata/if_expression/basic.carbon diff --git a/toolchain/lowering/testdata/if_expression/empty_block.carbon b/toolchain/lower/testdata/if_expression/empty_block.carbon similarity index 100% rename from toolchain/lowering/testdata/if_expression/empty_block.carbon rename to toolchain/lower/testdata/if_expression/empty_block.carbon diff --git a/toolchain/lowering/testdata/index/array_element_access.carbon b/toolchain/lower/testdata/index/array_element_access.carbon similarity index 100% rename from toolchain/lowering/testdata/index/array_element_access.carbon rename to toolchain/lower/testdata/index/array_element_access.carbon diff --git a/toolchain/lowering/testdata/index/tuple_element_access.carbon b/toolchain/lower/testdata/index/tuple_element_access.carbon similarity index 100% rename from toolchain/lowering/testdata/index/tuple_element_access.carbon rename to toolchain/lower/testdata/index/tuple_element_access.carbon diff --git a/toolchain/lowering/testdata/index/tuple_return_value_access.carbon b/toolchain/lower/testdata/index/tuple_return_value_access.carbon similarity index 100% rename from toolchain/lowering/testdata/index/tuple_return_value_access.carbon rename to toolchain/lower/testdata/index/tuple_return_value_access.carbon diff --git a/toolchain/lowering/testdata/namespace/function.carbon b/toolchain/lower/testdata/namespace/function.carbon similarity index 100% rename from toolchain/lowering/testdata/namespace/function.carbon rename to toolchain/lower/testdata/namespace/function.carbon diff --git a/toolchain/lowering/testdata/namespace/nested.carbon b/toolchain/lower/testdata/namespace/nested.carbon similarity index 100% rename from toolchain/lowering/testdata/namespace/nested.carbon rename to toolchain/lower/testdata/namespace/nested.carbon diff --git a/toolchain/lowering/testdata/operators/and.carbon b/toolchain/lower/testdata/operators/and.carbon similarity index 100% rename from toolchain/lowering/testdata/operators/and.carbon rename to toolchain/lower/testdata/operators/and.carbon diff --git a/toolchain/lowering/testdata/operators/and_empty_block.carbon b/toolchain/lower/testdata/operators/and_empty_block.carbon similarity index 100% rename from toolchain/lowering/testdata/operators/and_empty_block.carbon rename to toolchain/lower/testdata/operators/and_empty_block.carbon diff --git a/toolchain/lowering/testdata/operators/assignment.carbon b/toolchain/lower/testdata/operators/assignment.carbon similarity index 100% rename from toolchain/lowering/testdata/operators/assignment.carbon rename to toolchain/lower/testdata/operators/assignment.carbon diff --git a/toolchain/lowering/testdata/operators/not.carbon b/toolchain/lower/testdata/operators/not.carbon similarity index 100% rename from toolchain/lowering/testdata/operators/not.carbon rename to toolchain/lower/testdata/operators/not.carbon diff --git a/toolchain/lowering/testdata/operators/or.carbon b/toolchain/lower/testdata/operators/or.carbon similarity index 100% rename from toolchain/lowering/testdata/operators/or.carbon rename to toolchain/lower/testdata/operators/or.carbon diff --git a/toolchain/lowering/testdata/operators/or_empty_block.carbon b/toolchain/lower/testdata/operators/or_empty_block.carbon similarity index 100% rename from toolchain/lowering/testdata/operators/or_empty_block.carbon rename to toolchain/lower/testdata/operators/or_empty_block.carbon diff --git a/toolchain/lowering/testdata/pointer/address_of_field.carbon b/toolchain/lower/testdata/pointer/address_of_field.carbon similarity index 100% rename from toolchain/lowering/testdata/pointer/address_of_field.carbon rename to toolchain/lower/testdata/pointer/address_of_field.carbon diff --git a/toolchain/lowering/testdata/pointer/basic.carbon b/toolchain/lower/testdata/pointer/basic.carbon similarity index 100% rename from toolchain/lowering/testdata/pointer/basic.carbon rename to toolchain/lower/testdata/pointer/basic.carbon diff --git a/toolchain/lowering/testdata/return/code_after_return.carbon b/toolchain/lower/testdata/return/code_after_return.carbon similarity index 100% rename from toolchain/lowering/testdata/return/code_after_return.carbon rename to toolchain/lower/testdata/return/code_after_return.carbon diff --git a/toolchain/lowering/testdata/return/no_value.carbon b/toolchain/lower/testdata/return/no_value.carbon similarity index 100% rename from toolchain/lowering/testdata/return/no_value.carbon rename to toolchain/lower/testdata/return/no_value.carbon diff --git a/toolchain/lowering/testdata/return/value.carbon b/toolchain/lower/testdata/return/value.carbon similarity index 100% rename from toolchain/lowering/testdata/return/value.carbon rename to toolchain/lower/testdata/return/value.carbon diff --git a/toolchain/lowering/testdata/return/var.carbon b/toolchain/lower/testdata/return/var.carbon similarity index 100% rename from toolchain/lowering/testdata/return/var.carbon rename to toolchain/lower/testdata/return/var.carbon diff --git a/toolchain/lowering/testdata/struct/empty.carbon b/toolchain/lower/testdata/struct/empty.carbon similarity index 100% rename from toolchain/lowering/testdata/struct/empty.carbon rename to toolchain/lower/testdata/struct/empty.carbon diff --git a/toolchain/lowering/testdata/struct/member_access.carbon b/toolchain/lower/testdata/struct/member_access.carbon similarity index 100% rename from toolchain/lowering/testdata/struct/member_access.carbon rename to toolchain/lower/testdata/struct/member_access.carbon diff --git a/toolchain/lowering/testdata/struct/nested_struct.carbon b/toolchain/lower/testdata/struct/nested_struct.carbon similarity index 100% rename from toolchain/lowering/testdata/struct/nested_struct.carbon rename to toolchain/lower/testdata/struct/nested_struct.carbon diff --git a/toolchain/lowering/testdata/struct/one_entry.carbon b/toolchain/lower/testdata/struct/one_entry.carbon similarity index 100% rename from toolchain/lowering/testdata/struct/one_entry.carbon rename to toolchain/lower/testdata/struct/one_entry.carbon diff --git a/toolchain/lowering/testdata/struct/two_entries.carbon b/toolchain/lower/testdata/struct/two_entries.carbon similarity index 100% rename from toolchain/lowering/testdata/struct/two_entries.carbon rename to toolchain/lower/testdata/struct/two_entries.carbon diff --git a/toolchain/lowering/testdata/tuple/empty.carbon b/toolchain/lower/testdata/tuple/empty.carbon similarity index 100% rename from toolchain/lowering/testdata/tuple/empty.carbon rename to toolchain/lower/testdata/tuple/empty.carbon diff --git a/toolchain/lowering/testdata/tuple/nested_tuple.carbon b/toolchain/lower/testdata/tuple/nested_tuple.carbon similarity index 100% rename from toolchain/lowering/testdata/tuple/nested_tuple.carbon rename to toolchain/lower/testdata/tuple/nested_tuple.carbon diff --git a/toolchain/lowering/testdata/tuple/one_entry.carbon b/toolchain/lower/testdata/tuple/one_entry.carbon similarity index 100% rename from toolchain/lowering/testdata/tuple/one_entry.carbon rename to toolchain/lower/testdata/tuple/one_entry.carbon diff --git a/toolchain/lowering/testdata/tuple/two_entries.carbon b/toolchain/lower/testdata/tuple/two_entries.carbon similarity index 100% rename from toolchain/lowering/testdata/tuple/two_entries.carbon rename to toolchain/lower/testdata/tuple/two_entries.carbon diff --git a/toolchain/lowering/testdata/var/local.carbon b/toolchain/lower/testdata/var/local.carbon similarity index 100% rename from toolchain/lowering/testdata/var/local.carbon rename to toolchain/lower/testdata/var/local.carbon