Răsfoiți Sursa

Rename the lowering dir to lower (#3172)

This is continuing with #3070, starting dir renaming with lowering
because it's at the tip. AFAICT git is catching all the file moves.
Jon Ross-Perkins 2 ani în urmă
părinte
comite
ec307b18d8
72 a modificat fișierele cu 34 adăugiri și 34 ștergeri
  1. 1 1
      toolchain/autoupdate_testdata.py
  2. 1 1
      toolchain/driver/BUILD
  3. 1 1
      toolchain/driver/driver.cpp
  4. 12 12
      toolchain/lower/BUILD
  5. 0 0
      toolchain/lower/__init__.py
  6. 3 3
      toolchain/lower/file_context.cpp
  7. 3 3
      toolchain/lower/file_context.h
  8. 1 1
      toolchain/lower/function_context.cpp
  9. 4 4
      toolchain/lower/function_context.h
  10. 1 1
      toolchain/lower/handle.cpp
  11. 1 1
      toolchain/lower/handle_expression_category.cpp
  12. 1 1
      toolchain/lower/handle_type.cpp
  13. 2 2
      toolchain/lower/lower.cpp
  14. 3 3
      toolchain/lower/lower.h
  15. 0 0
      toolchain/lower/lower_file_test.cpp
  16. 0 0
      toolchain/lower/testdata/array/assign_return_value.carbon
  17. 0 0
      toolchain/lower/testdata/array/base.carbon
  18. 0 0
      toolchain/lower/testdata/basics/empty.carbon
  19. 0 0
      toolchain/lower/testdata/basics/fail_before_lowering.carbon
  20. 0 0
      toolchain/lower/testdata/basics/false_true.carbon
  21. 0 0
      toolchain/lower/testdata/basics/type_values.carbon
  22. 0 0
      toolchain/lower/testdata/basics/zero.carbon
  23. 0 0
      toolchain/lower/testdata/function/call/empty_struct.carbon
  24. 0 0
      toolchain/lower/testdata/function/call/empty_tuple.carbon
  25. 0 0
      toolchain/lower/testdata/function/call/i32.carbon
  26. 0 0
      toolchain/lower/testdata/function/call/implicit_empty_tuple_as_arg.carbon
  27. 0 0
      toolchain/lower/testdata/function/call/params_one.carbon
  28. 0 0
      toolchain/lower/testdata/function/call/params_one_comma.carbon
  29. 0 0
      toolchain/lower/testdata/function/call/params_two.carbon
  30. 0 0
      toolchain/lower/testdata/function/call/params_two_comma.carbon
  31. 0 0
      toolchain/lower/testdata/function/call/params_zero.carbon
  32. 0 0
      toolchain/lower/testdata/function/call/return_implicit.carbon
  33. 0 0
      toolchain/lower/testdata/function/call/struct_param.carbon
  34. 0 0
      toolchain/lower/testdata/function/call/tuple_param.carbon
  35. 0 0
      toolchain/lower/testdata/function/call/tuple_param_with_return_slot.carbon
  36. 0 0
      toolchain/lower/testdata/function/call/var_param.carbon
  37. 0 0
      toolchain/lower/testdata/function/declaration/simple.carbon
  38. 0 0
      toolchain/lower/testdata/function/definition/empty_struct.carbon
  39. 0 0
      toolchain/lower/testdata/function/definition/params_one.carbon
  40. 0 0
      toolchain/lower/testdata/function/definition/params_two.carbon
  41. 0 0
      toolchain/lower/testdata/function/definition/params_zero.carbon
  42. 0 0
      toolchain/lower/testdata/if/else.carbon
  43. 0 0
      toolchain/lower/testdata/if/no_else.carbon
  44. 0 0
      toolchain/lower/testdata/if_expression/basic.carbon
  45. 0 0
      toolchain/lower/testdata/if_expression/empty_block.carbon
  46. 0 0
      toolchain/lower/testdata/index/array_element_access.carbon
  47. 0 0
      toolchain/lower/testdata/index/tuple_element_access.carbon
  48. 0 0
      toolchain/lower/testdata/index/tuple_return_value_access.carbon
  49. 0 0
      toolchain/lower/testdata/namespace/function.carbon
  50. 0 0
      toolchain/lower/testdata/namespace/nested.carbon
  51. 0 0
      toolchain/lower/testdata/operators/and.carbon
  52. 0 0
      toolchain/lower/testdata/operators/and_empty_block.carbon
  53. 0 0
      toolchain/lower/testdata/operators/assignment.carbon
  54. 0 0
      toolchain/lower/testdata/operators/not.carbon
  55. 0 0
      toolchain/lower/testdata/operators/or.carbon
  56. 0 0
      toolchain/lower/testdata/operators/or_empty_block.carbon
  57. 0 0
      toolchain/lower/testdata/pointer/address_of_field.carbon
  58. 0 0
      toolchain/lower/testdata/pointer/basic.carbon
  59. 0 0
      toolchain/lower/testdata/return/code_after_return.carbon
  60. 0 0
      toolchain/lower/testdata/return/no_value.carbon
  61. 0 0
      toolchain/lower/testdata/return/value.carbon
  62. 0 0
      toolchain/lower/testdata/return/var.carbon
  63. 0 0
      toolchain/lower/testdata/struct/empty.carbon
  64. 0 0
      toolchain/lower/testdata/struct/member_access.carbon
  65. 0 0
      toolchain/lower/testdata/struct/nested_struct.carbon
  66. 0 0
      toolchain/lower/testdata/struct/one_entry.carbon
  67. 0 0
      toolchain/lower/testdata/struct/two_entries.carbon
  68. 0 0
      toolchain/lower/testdata/tuple/empty.carbon
  69. 0 0
      toolchain/lower/testdata/tuple/nested_tuple.carbon
  70. 0 0
      toolchain/lower/testdata/tuple/one_entry.carbon
  71. 0 0
      toolchain/lower/testdata/tuple/two_entries.carbon
  72. 0 0
      toolchain/lower/testdata/var/local.carbon

+ 1 - 1
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",
 }

+ 1 - 1
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",

+ 1 - 1
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"

+ 12 - 12
toolchain/lowering/BUILD → 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",

+ 0 - 0
toolchain/lowering/__init__.py → toolchain/lower/__init__.py


+ 3 - 3
toolchain/lowering/lowering_context.cpp → 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<llvm::Module> {
   CARBON_CHECK(llvm_module_) << "Run can only be called once.";
 

+ 3 - 3
toolchain/lowering/lowering_context.h → 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_

+ 1 - 1
toolchain/lowering/lowering_function_context.cpp → 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"
 

+ 4 - 4
toolchain/lowering/lowering_function_context.h → 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_

+ 1 - 1
toolchain/lowering/lowering_handle.cpp → 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 {

+ 1 - 1
toolchain/lowering/lowering_handle_expression_category.cpp → 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 {
 

+ 1 - 1
toolchain/lowering/lowering_handle_type.cpp → 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 {
 

+ 2 - 2
toolchain/lowering/lower_to_llvm.cpp → 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 {
 

+ 3 - 3
toolchain/lowering/lower_to_llvm.h → 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_

+ 0 - 0
toolchain/lowering/lowering_file_test.cpp → toolchain/lower/lower_file_test.cpp


+ 0 - 0
toolchain/lowering/testdata/array/assign_return_value.carbon → toolchain/lower/testdata/array/assign_return_value.carbon


+ 0 - 0
toolchain/lowering/testdata/array/base.carbon → toolchain/lower/testdata/array/base.carbon


+ 0 - 0
toolchain/lowering/testdata/basics/empty.carbon → toolchain/lower/testdata/basics/empty.carbon


+ 0 - 0
toolchain/lowering/testdata/basics/fail_before_lowering.carbon → toolchain/lower/testdata/basics/fail_before_lowering.carbon


+ 0 - 0
toolchain/lowering/testdata/basics/false_true.carbon → toolchain/lower/testdata/basics/false_true.carbon


+ 0 - 0
toolchain/lowering/testdata/basics/type_values.carbon → toolchain/lower/testdata/basics/type_values.carbon


+ 0 - 0
toolchain/lowering/testdata/basics/zero.carbon → toolchain/lower/testdata/basics/zero.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/empty_struct.carbon → toolchain/lower/testdata/function/call/empty_struct.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/empty_tuple.carbon → toolchain/lower/testdata/function/call/empty_tuple.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/i32.carbon → toolchain/lower/testdata/function/call/i32.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon → toolchain/lower/testdata/function/call/implicit_empty_tuple_as_arg.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/params_one.carbon → toolchain/lower/testdata/function/call/params_one.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/params_one_comma.carbon → toolchain/lower/testdata/function/call/params_one_comma.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/params_two.carbon → toolchain/lower/testdata/function/call/params_two.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/params_two_comma.carbon → toolchain/lower/testdata/function/call/params_two_comma.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/params_zero.carbon → toolchain/lower/testdata/function/call/params_zero.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/return_implicit.carbon → toolchain/lower/testdata/function/call/return_implicit.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/struct_param.carbon → toolchain/lower/testdata/function/call/struct_param.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/tuple_param.carbon → toolchain/lower/testdata/function/call/tuple_param.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/tuple_param_with_return_slot.carbon → toolchain/lower/testdata/function/call/tuple_param_with_return_slot.carbon


+ 0 - 0
toolchain/lowering/testdata/function/call/var_param.carbon → toolchain/lower/testdata/function/call/var_param.carbon


+ 0 - 0
toolchain/lowering/testdata/function/declaration/simple.carbon → toolchain/lower/testdata/function/declaration/simple.carbon


+ 0 - 0
toolchain/lowering/testdata/function/definition/empty_struct.carbon → toolchain/lower/testdata/function/definition/empty_struct.carbon


+ 0 - 0
toolchain/lowering/testdata/function/definition/params_one.carbon → toolchain/lower/testdata/function/definition/params_one.carbon


+ 0 - 0
toolchain/lowering/testdata/function/definition/params_two.carbon → toolchain/lower/testdata/function/definition/params_two.carbon


+ 0 - 0
toolchain/lowering/testdata/function/definition/params_zero.carbon → toolchain/lower/testdata/function/definition/params_zero.carbon


+ 0 - 0
toolchain/lowering/testdata/if/else.carbon → toolchain/lower/testdata/if/else.carbon


+ 0 - 0
toolchain/lowering/testdata/if/no_else.carbon → toolchain/lower/testdata/if/no_else.carbon


+ 0 - 0
toolchain/lowering/testdata/if_expression/basic.carbon → toolchain/lower/testdata/if_expression/basic.carbon


+ 0 - 0
toolchain/lowering/testdata/if_expression/empty_block.carbon → toolchain/lower/testdata/if_expression/empty_block.carbon


+ 0 - 0
toolchain/lowering/testdata/index/array_element_access.carbon → toolchain/lower/testdata/index/array_element_access.carbon


+ 0 - 0
toolchain/lowering/testdata/index/tuple_element_access.carbon → toolchain/lower/testdata/index/tuple_element_access.carbon


+ 0 - 0
toolchain/lowering/testdata/index/tuple_return_value_access.carbon → toolchain/lower/testdata/index/tuple_return_value_access.carbon


+ 0 - 0
toolchain/lowering/testdata/namespace/function.carbon → toolchain/lower/testdata/namespace/function.carbon


+ 0 - 0
toolchain/lowering/testdata/namespace/nested.carbon → toolchain/lower/testdata/namespace/nested.carbon


+ 0 - 0
toolchain/lowering/testdata/operators/and.carbon → toolchain/lower/testdata/operators/and.carbon


+ 0 - 0
toolchain/lowering/testdata/operators/and_empty_block.carbon → toolchain/lower/testdata/operators/and_empty_block.carbon


+ 0 - 0
toolchain/lowering/testdata/operators/assignment.carbon → toolchain/lower/testdata/operators/assignment.carbon


+ 0 - 0
toolchain/lowering/testdata/operators/not.carbon → toolchain/lower/testdata/operators/not.carbon


+ 0 - 0
toolchain/lowering/testdata/operators/or.carbon → toolchain/lower/testdata/operators/or.carbon


+ 0 - 0
toolchain/lowering/testdata/operators/or_empty_block.carbon → toolchain/lower/testdata/operators/or_empty_block.carbon


+ 0 - 0
toolchain/lowering/testdata/pointer/address_of_field.carbon → toolchain/lower/testdata/pointer/address_of_field.carbon


+ 0 - 0
toolchain/lowering/testdata/pointer/basic.carbon → toolchain/lower/testdata/pointer/basic.carbon


+ 0 - 0
toolchain/lowering/testdata/return/code_after_return.carbon → toolchain/lower/testdata/return/code_after_return.carbon


+ 0 - 0
toolchain/lowering/testdata/return/no_value.carbon → toolchain/lower/testdata/return/no_value.carbon


+ 0 - 0
toolchain/lowering/testdata/return/value.carbon → toolchain/lower/testdata/return/value.carbon


+ 0 - 0
toolchain/lowering/testdata/return/var.carbon → toolchain/lower/testdata/return/var.carbon


+ 0 - 0
toolchain/lowering/testdata/struct/empty.carbon → toolchain/lower/testdata/struct/empty.carbon


+ 0 - 0
toolchain/lowering/testdata/struct/member_access.carbon → toolchain/lower/testdata/struct/member_access.carbon


+ 0 - 0
toolchain/lowering/testdata/struct/nested_struct.carbon → toolchain/lower/testdata/struct/nested_struct.carbon


+ 0 - 0
toolchain/lowering/testdata/struct/one_entry.carbon → toolchain/lower/testdata/struct/one_entry.carbon


+ 0 - 0
toolchain/lowering/testdata/struct/two_entries.carbon → toolchain/lower/testdata/struct/two_entries.carbon


+ 0 - 0
toolchain/lowering/testdata/tuple/empty.carbon → toolchain/lower/testdata/tuple/empty.carbon


+ 0 - 0
toolchain/lowering/testdata/tuple/nested_tuple.carbon → toolchain/lower/testdata/tuple/nested_tuple.carbon


+ 0 - 0
toolchain/lowering/testdata/tuple/one_entry.carbon → toolchain/lower/testdata/tuple/one_entry.carbon


+ 0 - 0
toolchain/lowering/testdata/tuple/two_entries.carbon → toolchain/lower/testdata/tuple/two_entries.carbon


+ 0 - 0
toolchain/lowering/testdata/var/local.carbon → toolchain/lower/testdata/var/local.carbon