diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn index 6ff82df1e05..bb4cdfc0753 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn @@ -5,6 +5,7 @@ import("../../build/compiled_action.gni") import("../../sdk/lib/io/io_sources.gni") import("../runtime_args.gni") +import("../vm/compiler/compiler_sources.gni") import("../vm/vm_sources.gni") import("builtin_impl_sources.gni") import("builtin_sources.gni") @@ -957,6 +958,7 @@ executable("run_vm_tests") { # The VM sources are already included in libdart, so we just want to add in # the tests here. vm_tests = rebase_path(vm_sources_tests, ".", "../vm") + compiler_tests = rebase_path(compiler_sources_tests, ".", "../vm/compiler") sources = [ "error_exit.cc", @@ -967,7 +969,7 @@ executable("run_vm_tests") { "run_vm_tests.cc", "dfe.cc", "dfe.h", - ] + builtin_impl_tests + vm_tests + ] + builtin_impl_tests + vm_tests + compiler_tests if (!is_win) { ldflags = [ "-rdynamic" ] diff --git a/runtime/lib/array.cc b/runtime/lib/array.cc index 1a9217b2c69..e167523aa03 100644 --- a/runtime/lib/array.cc +++ b/runtime/lib/array.cc @@ -3,7 +3,6 @@ // BSD-style license that can be found in the LICENSE file. #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/bootstrap_natives.h" #include "vm/exceptions.h" #include "vm/native_entry.h" diff --git a/runtime/lib/function.cc b/runtime/lib/function.cc index 8b8c2abae9c..89bca1d6486 100644 --- a/runtime/lib/function.cc +++ b/runtime/lib/function.cc @@ -4,7 +4,7 @@ #include "vm/bootstrap_natives.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/exceptions.h" #include "vm/native_entry.h" diff --git a/runtime/lib/growable_array.cc b/runtime/lib/growable_array.cc index d533f0d6adb..6f7f25452fd 100644 --- a/runtime/lib/growable_array.cc +++ b/runtime/lib/growable_array.cc @@ -4,7 +4,6 @@ #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/bootstrap_natives.h" #include "vm/exceptions.h" #include "vm/native_entry.h" diff --git a/runtime/lib/linked_hash_map.cc b/runtime/lib/linked_hash_map.cc index 8f7fefa5a19..94f7a276c19 100644 --- a/runtime/lib/linked_hash_map.cc +++ b/runtime/lib/linked_hash_map.cc @@ -4,7 +4,6 @@ #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/bootstrap_natives.h" #include "vm/exceptions.h" #include "vm/flags.h" diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc index 91e77d1cbbc..7fd71486922 100644 --- a/runtime/lib/mirrors.cc +++ b/runtime/lib/mirrors.cc @@ -7,11 +7,11 @@ #include "lib/invocation_mirror.h" #include "vm/bootstrap_natives.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/frontend/kernel_to_il.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/exceptions.h" #include "vm/flags.h" -#include "vm/kernel_to_il.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/port.h" diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn index 5baea6e76f4..290ebd9abc1 100644 --- a/runtime/vm/BUILD.gn +++ b/runtime/vm/BUILD.gn @@ -31,6 +31,7 @@ import("../lib/profiler_sources.gni") import("../lib/typed_data_sources.gni") import("../lib/vmservice_sources.gni") import("../runtime_args.gni") +import("compiler/compiler_sources.gni") import("vm_sources.gni") config("libdart_vm_config") { @@ -71,7 +72,7 @@ template("build_libdart_vm") { "*_test.cc", "*_test.h", ]) - sources = vm_sources + sources = vm_sources + rebase_path(compiler_sources, ".", "./compiler/") include_dirs = [ ".." ] } } diff --git a/runtime/vm/ast.cc b/runtime/vm/ast.cc index ad7ced4d56d..3297522a736 100644 --- a/runtime/vm/ast.cc +++ b/runtime/vm/ast.cc @@ -5,7 +5,7 @@ #if !defined(DART_PRECOMPILED_RUNTIME) #include "vm/ast.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/isolate.h" #include "vm/log.h" diff --git a/runtime/vm/bootstrap.cc b/runtime/vm/bootstrap.cc index b83af65d8c1..ebe1d6fc07f 100644 --- a/runtime/vm/bootstrap.cc +++ b/runtime/vm/bootstrap.cc @@ -8,7 +8,7 @@ #include "vm/bootstrap_natives.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #if !defined(DART_PRECOMPILED_RUNTIME) #include "vm/kernel.h" diff --git a/runtime/vm/bootstrap_nocore.cc b/runtime/vm/bootstrap_nocore.cc index 0ce23803717..e10144b4892 100644 --- a/runtime/vm/bootstrap_nocore.cc +++ b/runtime/vm/bootstrap_nocore.cc @@ -8,7 +8,7 @@ #if !defined(DART_PRECOMPILED_RUNTIME) #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/kernel_loader.h" #endif #include "vm/object.h" diff --git a/runtime/vm/code_descriptors_test.cc b/runtime/vm/code_descriptors_test.cc index 33ed6077a1b..aaa7fc13713 100644 --- a/runtime/vm/code_descriptors_test.cc +++ b/runtime/vm/code_descriptors_test.cc @@ -5,10 +5,10 @@ #include "platform/assert.h" #include "vm/globals.h" -#include "vm/assembler.h" #include "vm/ast.h" #include "vm/code_descriptors.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/native_entry.h" #include "vm/parser.h" diff --git a/runtime/vm/code_patcher_arm.cc b/runtime/vm/code_patcher_arm.cc index bc4ae08335f..47b5f5e3346 100644 --- a/runtime/vm/code_patcher_arm.cc +++ b/runtime/vm/code_patcher_arm.cc @@ -7,7 +7,7 @@ #include "vm/code_patcher.h" -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/instructions.h" #include "vm/object.h" diff --git a/runtime/vm/code_patcher_arm64_test.cc b/runtime/vm/code_patcher_arm64_test.cc index 44da9ee02c3..8807c106bdb 100644 --- a/runtime/vm/code_patcher_arm64_test.cc +++ b/runtime/vm/code_patcher_arm64_test.cc @@ -5,8 +5,8 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM64) -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/dart_entry.h" #include "vm/instructions.h" #include "vm/native_entry.h" diff --git a/runtime/vm/code_patcher_arm_test.cc b/runtime/vm/code_patcher_arm_test.cc index 565b101ad9a..abf75f2ac49 100644 --- a/runtime/vm/code_patcher_arm_test.cc +++ b/runtime/vm/code_patcher_arm_test.cc @@ -5,8 +5,8 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM) -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/dart_entry.h" #include "vm/instructions.h" #include "vm/native_entry.h" diff --git a/runtime/vm/code_patcher_dbc.cc b/runtime/vm/code_patcher_dbc.cc index b7ae4860c97..2ab9ae42f27 100644 --- a/runtime/vm/code_patcher_dbc.cc +++ b/runtime/vm/code_patcher_dbc.cc @@ -7,7 +7,7 @@ #include "vm/code_patcher.h" -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/instructions.h" #include "vm/object.h" diff --git a/runtime/vm/code_patcher_ia32.cc b/runtime/vm/code_patcher_ia32.cc index f408644f2f1..70ce4ef4f52 100644 --- a/runtime/vm/code_patcher_ia32.cc +++ b/runtime/vm/code_patcher_ia32.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_IA32) -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/instructions.h" #include "vm/object.h" #include "vm/raw_object.h" diff --git a/runtime/vm/code_patcher_ia32_test.cc b/runtime/vm/code_patcher_ia32_test.cc index 79a01af4f6c..ee80cc6d5c6 100644 --- a/runtime/vm/code_patcher_ia32_test.cc +++ b/runtime/vm/code_patcher_ia32_test.cc @@ -5,8 +5,8 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/dart_entry.h" #include "vm/instructions.h" #include "vm/native_entry.h" diff --git a/runtime/vm/code_patcher_x64.cc b/runtime/vm/code_patcher_x64.cc index 1ce5c5eb6da..8cebf388dfc 100644 --- a/runtime/vm/code_patcher_x64.cc +++ b/runtime/vm/code_patcher_x64.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64. #if defined(TARGET_ARCH_X64) -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/instructions.h" #include "vm/object.h" #include "vm/raw_object.h" diff --git a/runtime/vm/code_patcher_x64_test.cc b/runtime/vm/code_patcher_x64_test.cc index 824c3b79063..1a096ba3be1 100644 --- a/runtime/vm/code_patcher_x64_test.cc +++ b/runtime/vm/code_patcher_x64_test.cc @@ -5,8 +5,8 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_X64) -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/dart_entry.h" #include "vm/instructions.h" #include "vm/native_entry.h" diff --git a/runtime/vm/compilation_trace.h b/runtime/vm/compilation_trace.h index 3e9e528d457..865cb1234b7 100644 --- a/runtime/vm/compilation_trace.h +++ b/runtime/vm/compilation_trace.h @@ -6,7 +6,7 @@ #define RUNTIME_VM_COMPILATION_TRACE_H_ #include "platform/assert.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/object.h" #include "vm/program_visitor.h" #include "vm/zone_text_buffer.h" diff --git a/runtime/vm/compiler/README.md b/runtime/vm/compiler/README.md new file mode 100644 index 00000000000..5906b473bb7 --- /dev/null +++ b/runtime/vm/compiler/README.md @@ -0,0 +1,19 @@ +# Dart VM Compilation Pipeline + +This folder contains Dart VM compilation pipeline. + +Compilation pipeline is mainly responsible for converting AST or Kernel AST +into IL flow graphs and then generating native code from IL. + +It has the following structure: + +| Directory | What goes there | +| ------------- |-------------------------------------------------------------| +| `assembler/` | Assemblers and disassemblers | +| `backend/` | IL based compilation backend: optimization passes and architecture specific code generation rules | +| `frontend/` | Frontends responsible for converting AST into IL | +| `jit/` | JIT specific passes and compilation pipeline entry points | +| `aot/` | AOT specific passes and compilation pipeline entry points | +| `.` | Shared code or code without clear designation. | + +Currently there are no layering restrictions and components from different subfolders can reference each other. diff --git a/runtime/vm/aot_optimizer.cc b/runtime/vm/compiler/aot/aot_optimizer.cc similarity index 99% rename from runtime/vm/aot_optimizer.cc rename to runtime/vm/compiler/aot/aot_optimizer.cc index 1c06d3316ba..ee9453805cf 100644 --- a/runtime/vm/aot_optimizer.cc +++ b/runtime/vm/compiler/aot/aot_optimizer.cc @@ -2,28 +2,28 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/aot_optimizer.h" +#include "vm/compiler/aot/aot_optimizer.h" #include "vm/bit_vector.h" -#include "vm/branch_optimizer.h" -#include "vm/cha.h" -#include "vm/compiler.h" +#include "vm/compiler/aot/precompiler.h" +#include "vm/compiler/backend/branch_optimizer.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/inliner.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/cha.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" +#include "vm/compiler/jit/jit_optimizer.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/exceptions.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_inliner.h" -#include "vm/flow_graph_range_analysis.h" #include "vm/hash_map.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" -#include "vm/jit_optimizer.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/optimizer.h" #include "vm/parser.h" -#include "vm/precompiler.h" #include "vm/resolver.h" #include "vm/scopes.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/aot_optimizer.h b/runtime/vm/compiler/aot/aot_optimizer.h similarity index 95% rename from runtime/vm/aot_optimizer.h rename to runtime/vm/compiler/aot/aot_optimizer.h index 50bd97ac026..796d3a1169b 100644 --- a/runtime/vm/aot_optimizer.h +++ b/runtime/vm/compiler/aot/aot_optimizer.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_AOT_OPTIMIZER_H_ -#define RUNTIME_VM_AOT_OPTIMIZER_H_ +#ifndef RUNTIME_VM_COMPILER_AOT_AOT_OPTIMIZER_H_ +#define RUNTIME_VM_COMPILER_AOT_AOT_OPTIMIZER_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -149,4 +149,4 @@ class AotOptimizer : public FlowGraphVisitor { } // namespace dart -#endif // RUNTIME_VM_AOT_OPTIMIZER_H_ +#endif // RUNTIME_VM_COMPILER_AOT_AOT_OPTIMIZER_H_ diff --git a/runtime/vm/precompiler.cc b/runtime/vm/compiler/aot/precompiler.cc similarity index 99% rename from runtime/vm/precompiler.cc rename to runtime/vm/compiler/aot/precompiler.cc index f30f1271402..dedd6a85ce7 100644 --- a/runtime/vm/precompiler.cc +++ b/runtime/vm/compiler/aot/precompiler.cc @@ -2,30 +2,31 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/precompiler.h" +#include "vm/compiler/aot/precompiler.h" -#include "vm/aot_optimizer.h" -#include "vm/assembler.h" #include "vm/ast_printer.h" -#include "vm/branch_optimizer.h" -#include "vm/cha.h" #include "vm/class_finalizer.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" -#include "vm/constant_propagator.h" +#include "vm/compiler/aot/aot_optimizer.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/backend/branch_optimizer.h" +#include "vm/compiler/backend/constant_propagator.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/inliner.h" +#include "vm/compiler/backend/linearscan.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/backend/redundancy_elimination.h" +#include "vm/compiler/backend/type_propagator.h" +#include "vm/compiler/cha.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/disassembler.h" #include "vm/exceptions.h" #include "vm/flags.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_allocator.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_inliner.h" -#include "vm/flow_graph_range_analysis.h" -#include "vm/flow_graph_type_propagator.h" #include "vm/hash_table.h" -#include "vm/il_printer.h" #include "vm/isolate.h" #include "vm/json_parser.h" #include "vm/log.h" @@ -35,7 +36,6 @@ #include "vm/os.h" #include "vm/parser.h" #include "vm/program_visitor.h" -#include "vm/redundancy_elimination.h" #include "vm/regexp_assembler.h" #include "vm/regexp_parser.h" #include "vm/resolver.h" diff --git a/runtime/vm/precompiler.h b/runtime/vm/compiler/aot/precompiler.h similarity index 99% rename from runtime/vm/precompiler.h rename to runtime/vm/compiler/aot/precompiler.h index 4c5ddcb38b4..fd563ff56b9 100644 --- a/runtime/vm/precompiler.h +++ b/runtime/vm/compiler/aot/precompiler.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_PRECOMPILER_H_ -#define RUNTIME_VM_PRECOMPILER_H_ +#ifndef RUNTIME_VM_COMPILER_AOT_PRECOMPILER_H_ +#define RUNTIME_VM_COMPILER_AOT_PRECOMPILER_H_ #include "vm/allocation.h" #include "vm/hash_map.h" @@ -687,4 +687,4 @@ class Obfuscator { } // namespace dart -#endif // RUNTIME_VM_PRECOMPILER_H_ +#endif // RUNTIME_VM_COMPILER_AOT_PRECOMPILER_H_ diff --git a/runtime/vm/assembler.cc b/runtime/vm/compiler/assembler/assembler.cc similarity index 99% rename from runtime/vm/assembler.cc rename to runtime/vm/compiler/assembler/assembler.cc index 8316dfde7d3..5d2b8e85694 100644 --- a/runtime/vm/assembler.cc +++ b/runtime/vm/compiler/assembler/assembler.cc @@ -4,7 +4,7 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "platform/utils.h" #include "vm/cpu.h" diff --git a/runtime/vm/assembler.h b/runtime/vm/compiler/assembler/assembler.h similarity index 96% rename from runtime/vm/assembler.h rename to runtime/vm/compiler/assembler/assembler.h index 6beeb1eaa78..cb8f495fd9b 100644 --- a/runtime/vm/assembler.h +++ b/runtime/vm/compiler/assembler/assembler.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_ASSEMBLER_H_ -#define RUNTIME_VM_ASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ #include "platform/assert.h" #include "vm/allocation.h" @@ -318,17 +318,17 @@ enum RestorePP { kRestoreCallerPP, kKeepCalleePP }; } // namespace dart #if defined(TARGET_ARCH_IA32) -#include "vm/assembler_ia32.h" +#include "vm/compiler/assembler/assembler_ia32.h" #elif defined(TARGET_ARCH_X64) -#include "vm/assembler_x64.h" +#include "vm/compiler/assembler/assembler_x64.h" #elif defined(TARGET_ARCH_ARM) -#include "vm/assembler_arm.h" +#include "vm/compiler/assembler/assembler_arm.h" #elif defined(TARGET_ARCH_ARM64) -#include "vm/assembler_arm64.h" +#include "vm/compiler/assembler/assembler_arm64.h" #elif defined(TARGET_ARCH_DBC) -#include "vm/assembler_dbc.h" +#include "vm/compiler/assembler/assembler_dbc.h" #else #error Unknown architecture. #endif -#endif // RUNTIME_VM_ASSEMBLER_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ diff --git a/runtime/vm/assembler_arm.cc b/runtime/vm/compiler/assembler/assembler_arm.cc similarity index 99% rename from runtime/vm/assembler_arm.cc rename to runtime/vm/compiler/assembler/assembler_arm.cc index c71809ac597..19d9673a176 100644 --- a/runtime/vm/assembler_arm.cc +++ b/runtime/vm/compiler/assembler/assembler_arm.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // NOLINT #if defined(TARGET_ARCH_ARM) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/longjump.h" #include "vm/runtime_entry.h" diff --git a/runtime/vm/assembler_arm.h b/runtime/vm/compiler/assembler/assembler_arm.h similarity index 99% rename from runtime/vm/assembler_arm.h rename to runtime/vm/compiler/assembler/assembler_arm.h index b09efd4e0b7..11ef2e647cd 100644 --- a/runtime/vm/assembler_arm.h +++ b/runtime/vm/compiler/assembler/assembler_arm.h @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_ASSEMBLER_ARM_H_ -#define RUNTIME_VM_ASSEMBLER_ARM_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_ARM_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_ARM_H_ -#ifndef RUNTIME_VM_ASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ #error Do not include assembler_arm.h directly; use assembler.h instead. #endif @@ -1253,4 +1253,4 @@ class Assembler : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_ASSEMBLER_ARM_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_ARM_H_ diff --git a/runtime/vm/assembler_arm64.cc b/runtime/vm/compiler/assembler/assembler_arm64.cc similarity index 99% rename from runtime/vm/assembler_arm64.cc rename to runtime/vm/compiler/assembler/assembler_arm64.cc index 5492c029ee9..df67c27615c 100644 --- a/runtime/vm/assembler_arm64.cc +++ b/runtime/vm/compiler/assembler/assembler_arm64.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // NOLINT #if defined(TARGET_ARCH_ARM64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/longjump.h" #include "vm/runtime_entry.h" diff --git a/runtime/vm/assembler_arm64.h b/runtime/vm/compiler/assembler/assembler_arm64.h similarity index 99% rename from runtime/vm/assembler_arm64.h rename to runtime/vm/compiler/assembler/assembler_arm64.h index 921fc7a8742..b028ff7538e 100644 --- a/runtime/vm/assembler_arm64.h +++ b/runtime/vm/compiler/assembler/assembler_arm64.h @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_ASSEMBLER_ARM64_H_ -#define RUNTIME_VM_ASSEMBLER_ARM64_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_ARM64_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_ARM64_H_ -#ifndef RUNTIME_VM_ASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ #error Do not include assembler_arm64.h directly; use assembler.h instead. #endif @@ -1938,4 +1938,4 @@ class Assembler : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_ASSEMBLER_ARM64_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_ARM64_H_ diff --git a/runtime/vm/assembler_arm64_test.cc b/runtime/vm/compiler/assembler/assembler_arm64_test.cc similarity index 99% rename from runtime/vm/assembler_arm64_test.cc rename to runtime/vm/compiler/assembler/assembler_arm64_test.cc index 086e1ad69fd..563304bd619 100644 --- a/runtime/vm/assembler_arm64_test.cc +++ b/runtime/vm/compiler/assembler/assembler_arm64_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM64) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/os.h" #include "vm/unit_test.h" diff --git a/runtime/vm/assembler_arm_test.cc b/runtime/vm/compiler/assembler/assembler_arm_test.cc similarity index 99% rename from runtime/vm/assembler_arm_test.cc rename to runtime/vm/compiler/assembler/assembler_arm_test.cc index 001a016dac4..2809d585086 100644 --- a/runtime/vm/assembler_arm_test.cc +++ b/runtime/vm/compiler/assembler/assembler_arm_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/os.h" #include "vm/unit_test.h" diff --git a/runtime/vm/assembler_dbc.cc b/runtime/vm/compiler/assembler/assembler_dbc.cc similarity index 98% rename from runtime/vm/assembler_dbc.cc rename to runtime/vm/compiler/assembler/assembler_dbc.cc index 96600005f6a..8da54811c33 100644 --- a/runtime/vm/assembler_dbc.cc +++ b/runtime/vm/compiler/assembler/assembler_dbc.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // NOLINT #if defined(TARGET_ARCH_DBC) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/longjump.h" #include "vm/runtime_entry.h" diff --git a/runtime/vm/assembler_dbc.h b/runtime/vm/compiler/assembler/assembler_dbc.h similarity index 95% rename from runtime/vm/assembler_dbc.h rename to runtime/vm/compiler/assembler/assembler_dbc.h index 39c3d9a49d4..612459c6f89 100644 --- a/runtime/vm/assembler_dbc.h +++ b/runtime/vm/compiler/assembler/assembler_dbc.h @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_ASSEMBLER_DBC_H_ -#define RUNTIME_VM_ASSEMBLER_DBC_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_DBC_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_DBC_H_ -#ifndef RUNTIME_VM_ASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ #error Do not include assembler_dbc.h directly; use assembler.h instead. #endif @@ -183,4 +183,4 @@ class Assembler : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_ASSEMBLER_DBC_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_DBC_H_ diff --git a/runtime/vm/assembler_dbc_test.cc b/runtime/vm/compiler/assembler/assembler_dbc_test.cc similarity index 99% rename from runtime/vm/assembler_dbc_test.cc rename to runtime/vm/compiler/assembler/assembler_dbc_test.cc index 2d545df1c1b..5b27a9c4654 100644 --- a/runtime/vm/assembler_dbc_test.cc +++ b/runtime/vm/compiler/assembler/assembler_dbc_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_DBC) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/stack_frame.h" #include "vm/unit_test.h" diff --git a/runtime/vm/assembler_ia32.cc b/runtime/vm/compiler/assembler/assembler_ia32.cc similarity index 99% rename from runtime/vm/assembler_ia32.cc rename to runtime/vm/compiler/assembler/assembler_ia32.cc index 189a7847691..7d7cdd62677 100644 --- a/runtime/vm/assembler_ia32.cc +++ b/runtime/vm/compiler/assembler/assembler_ia32.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // NOLINT #if defined(TARGET_ARCH_IA32) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/heap.h" #include "vm/instructions.h" diff --git a/runtime/vm/assembler_ia32.h b/runtime/vm/compiler/assembler/assembler_ia32.h similarity index 99% rename from runtime/vm/assembler_ia32.h rename to runtime/vm/compiler/assembler/assembler_ia32.h index 299ba2a7ffd..cd574722e42 100644 --- a/runtime/vm/assembler_ia32.h +++ b/runtime/vm/compiler/assembler/assembler_ia32.h @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_ASSEMBLER_IA32_H_ -#define RUNTIME_VM_ASSEMBLER_IA32_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_IA32_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_IA32_H_ -#ifndef RUNTIME_VM_ASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ #error Do not include assembler_ia32.h directly; use assembler.h instead. #endif @@ -1001,4 +1001,4 @@ inline void Assembler::EmitOperandSizeOverride() { } // namespace dart -#endif // RUNTIME_VM_ASSEMBLER_IA32_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_IA32_H_ diff --git a/runtime/vm/assembler_ia32_test.cc b/runtime/vm/compiler/assembler/assembler_ia32_test.cc similarity index 99% rename from runtime/vm/assembler_ia32_test.cc rename to runtime/vm/compiler/assembler/assembler_ia32_test.cc index 85c5e995d99..91510e51e11 100644 --- a/runtime/vm/assembler_ia32_test.cc +++ b/runtime/vm/compiler/assembler/assembler_ia32_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/os.h" #include "vm/unit_test.h" diff --git a/runtime/vm/assembler_test.cc b/runtime/vm/compiler/assembler/assembler_test.cc similarity index 98% rename from runtime/vm/assembler_test.cc rename to runtime/vm/compiler/assembler/assembler_test.cc index be5b7c3ea1e..77947ed4692 100644 --- a/runtime/vm/assembler_test.cc +++ b/runtime/vm/compiler/assembler/assembler_test.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/globals.h" #include "vm/os.h" #include "vm/simulator.h" diff --git a/runtime/vm/assembler_x64.cc b/runtime/vm/compiler/assembler/assembler_x64.cc similarity index 99% rename from runtime/vm/assembler_x64.cc rename to runtime/vm/compiler/assembler/assembler_x64.cc index 4ac7a016e4f..cd5393a256f 100644 --- a/runtime/vm/assembler_x64.cc +++ b/runtime/vm/compiler/assembler/assembler_x64.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" // NOLINT #if defined(TARGET_ARCH_X64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/locations.h" #include "vm/cpu.h" #include "vm/heap.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/memory_region.h" #include "vm/runtime_entry.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/assembler_x64.h b/runtime/vm/compiler/assembler/assembler_x64.h similarity index 99% rename from runtime/vm/assembler_x64.h rename to runtime/vm/compiler/assembler/assembler_x64.h index 01ce51aa152..ec8310bdb0c 100644 --- a/runtime/vm/assembler_x64.h +++ b/runtime/vm/compiler/assembler/assembler_x64.h @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_ASSEMBLER_X64_H_ -#define RUNTIME_VM_ASSEMBLER_X64_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_X64_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_X64_H_ -#ifndef RUNTIME_VM_ASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_H_ #error Do not include assembler_x64.h directly; use assembler.h instead. #endif @@ -1136,4 +1136,4 @@ inline void Assembler::EmitOperandSizeOverride() { } // namespace dart -#endif // RUNTIME_VM_ASSEMBLER_X64_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_ASSEMBLER_X64_H_ diff --git a/runtime/vm/assembler_x64_test.cc b/runtime/vm/compiler/assembler/assembler_x64_test.cc similarity index 99% rename from runtime/vm/assembler_x64_test.cc rename to runtime/vm/compiler/assembler/assembler_x64_test.cc index 0058cbfadc1..1331f92c2b1 100644 --- a/runtime/vm/assembler_x64_test.cc +++ b/runtime/vm/compiler/assembler/assembler_x64_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_X64) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/os.h" #include "vm/unit_test.h" #include "vm/virtual_memory.h" diff --git a/runtime/vm/disassembler.cc b/runtime/vm/compiler/assembler/disassembler.cc similarity index 98% rename from runtime/vm/disassembler.cc rename to runtime/vm/compiler/assembler/disassembler.cc index a6c183cb299..0a796efa6d5 100644 --- a/runtime/vm/disassembler.cc +++ b/runtime/vm/compiler/assembler/disassembler.cc @@ -4,13 +4,13 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/disassembler.h" +#include "vm/compiler/assembler/disassembler.h" -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/il_printer.h" #include "vm/deopt_instructions.h" #include "vm/globals.h" -#include "vm/il_printer.h" #include "vm/instructions.h" #include "vm/json_stream.h" #include "vm/log.h" diff --git a/runtime/vm/disassembler.h b/runtime/vm/compiler/assembler/disassembler.h similarity index 95% rename from runtime/vm/disassembler.h rename to runtime/vm/compiler/assembler/disassembler.h index 2d502de55fe..9dd37686c9a 100644 --- a/runtime/vm/disassembler.h +++ b/runtime/vm/compiler/assembler/disassembler.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_DISASSEMBLER_H_ -#define RUNTIME_VM_DISASSEMBLER_H_ +#ifndef RUNTIME_VM_COMPILER_ASSEMBLER_DISASSEMBLER_H_ +#define RUNTIME_VM_COMPILER_ASSEMBLER_DISASSEMBLER_H_ #include "vm/allocation.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/globals.h" #include "vm/log.h" @@ -146,4 +146,4 @@ class Disassembler : public AllStatic { } // namespace dart -#endif // RUNTIME_VM_DISASSEMBLER_H_ +#endif // RUNTIME_VM_COMPILER_ASSEMBLER_DISASSEMBLER_H_ diff --git a/runtime/vm/disassembler_arm.cc b/runtime/vm/compiler/assembler/disassembler_arm.cc similarity index 99% rename from runtime/vm/disassembler_arm.cc rename to runtime/vm/compiler/assembler/disassembler_arm.cc index 0fe431b2965..f43bd411089 100644 --- a/runtime/vm/disassembler_arm.cc +++ b/runtime/vm/compiler/assembler/disassembler_arm.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM. #if defined(TARGET_ARCH_ARM) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/disassembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "platform/assert.h" #include "vm/cpu.h" diff --git a/runtime/vm/disassembler_arm64.cc b/runtime/vm/compiler/assembler/disassembler_arm64.cc similarity index 99% rename from runtime/vm/disassembler_arm64.cc rename to runtime/vm/compiler/assembler/disassembler_arm64.cc index f05aea552f2..7ae70c4ed6e 100644 --- a/runtime/vm/disassembler_arm64.cc +++ b/runtime/vm/compiler/assembler/disassembler_arm64.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM64. #if defined(TARGET_ARCH_ARM64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/disassembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "platform/assert.h" #include "vm/instructions.h" diff --git a/runtime/vm/disassembler_dbc.cc b/runtime/vm/compiler/assembler/disassembler_dbc.cc similarity index 99% rename from runtime/vm/disassembler_dbc.cc rename to runtime/vm/compiler/assembler/disassembler_dbc.cc index e12fdf330e2..1047cc022f9 100644 --- a/runtime/vm/disassembler_dbc.cc +++ b/runtime/vm/compiler/assembler/disassembler_dbc.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/disassembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC. #if defined(TARGET_ARCH_DBC) diff --git a/runtime/vm/disassembler_ia32.cc b/runtime/vm/compiler/assembler/disassembler_ia32.cc similarity index 99% rename from runtime/vm/disassembler_ia32.cc rename to runtime/vm/compiler/assembler/disassembler_ia32.cc index 3716d128eff..fddccdb6577 100644 --- a/runtime/vm/disassembler_ia32.cc +++ b/runtime/vm/compiler/assembler/disassembler_ia32.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_IA32) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/disassembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "platform/utils.h" #include "vm/allocation.h" diff --git a/runtime/vm/disassembler_test.cc b/runtime/vm/compiler/assembler/disassembler_test.cc similarity index 90% rename from runtime/vm/disassembler_test.cc rename to runtime/vm/compiler/assembler/disassembler_test.cc index 81cb8466289..a55a3b85990 100644 --- a/runtime/vm/disassembler_test.cc +++ b/runtime/vm/compiler/assembler/disassembler_test.cc @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/disassembler.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/unit_test.h" #include "vm/virtual_memory.h" diff --git a/runtime/vm/disassembler_x64.cc b/runtime/vm/compiler/assembler/disassembler_x64.cc similarity index 99% rename from runtime/vm/disassembler_x64.cc rename to runtime/vm/compiler/assembler/disassembler_x64.cc index 38b7fa7c778..a603e3d8f55 100644 --- a/runtime/vm/disassembler_x64.cc +++ b/runtime/vm/compiler/assembler/disassembler_x64.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_X64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/disassembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "platform/utils.h" #include "vm/allocation.h" diff --git a/runtime/vm/block_scheduler.cc b/runtime/vm/compiler/backend/block_scheduler.cc similarity index 98% rename from runtime/vm/block_scheduler.cc rename to runtime/vm/compiler/backend/block_scheduler.cc index 00461d5fcd6..acc03785f2c 100644 --- a/runtime/vm/block_scheduler.cc +++ b/runtime/vm/compiler/backend/block_scheduler.cc @@ -4,12 +4,12 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/block_scheduler.h" +#include "vm/compiler/backend/block_scheduler.h" #include "vm/allocation.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" -#include "vm/flow_graph.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/jit/compiler.h" namespace dart { diff --git a/runtime/vm/block_scheduler.h b/runtime/vm/compiler/backend/block_scheduler.h similarity index 78% rename from runtime/vm/block_scheduler.h rename to runtime/vm/compiler/backend/block_scheduler.h index 8a5cadac9c1..f1f1217febf 100644 --- a/runtime/vm/block_scheduler.h +++ b/runtime/vm/compiler/backend/block_scheduler.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_BLOCK_SCHEDULER_H_ -#define RUNTIME_VM_BLOCK_SCHEDULER_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_BLOCK_SCHEDULER_H_ +#define RUNTIME_VM_COMPILER_BACKEND_BLOCK_SCHEDULER_H_ #include "vm/allocation.h" @@ -27,4 +27,4 @@ class BlockScheduler : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_BLOCK_SCHEDULER_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_BLOCK_SCHEDULER_H_ diff --git a/runtime/vm/branch_optimizer.cc b/runtime/vm/compiler/backend/branch_optimizer.cc similarity index 99% rename from runtime/vm/branch_optimizer.cc rename to runtime/vm/compiler/backend/branch_optimizer.cc index b6391d07ccd..47ca82ab23d 100644 --- a/runtime/vm/branch_optimizer.cc +++ b/runtime/vm/compiler/backend/branch_optimizer.cc @@ -4,10 +4,10 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/branch_optimizer.h" +#include "vm/compiler/backend/branch_optimizer.h" -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { diff --git a/runtime/vm/branch_optimizer.h b/runtime/vm/compiler/backend/branch_optimizer.h similarity index 91% rename from runtime/vm/branch_optimizer.h rename to runtime/vm/compiler/backend/branch_optimizer.h index c1d77740591..70643ea1e81 100644 --- a/runtime/vm/branch_optimizer.h +++ b/runtime/vm/compiler/backend/branch_optimizer.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_BRANCH_OPTIMIZER_H_ -#define RUNTIME_VM_BRANCH_OPTIMIZER_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_BRANCH_OPTIMIZER_H_ +#define RUNTIME_VM_COMPILER_BACKEND_BRANCH_OPTIMIZER_H_ #include "vm/allocation.h" @@ -51,4 +51,4 @@ class IfConverter : public AllStatic { } // namespace dart -#endif // RUNTIME_VM_BRANCH_OPTIMIZER_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_BRANCH_OPTIMIZER_H_ diff --git a/runtime/vm/constant_propagator.cc b/runtime/vm/compiler/backend/constant_propagator.cc similarity index 99% rename from runtime/vm/constant_propagator.cc rename to runtime/vm/compiler/backend/constant_propagator.cc index 3d51efd7712..f1b5855b929 100644 --- a/runtime/vm/constant_propagator.cc +++ b/runtime/vm/compiler/backend/constant_propagator.cc @@ -4,14 +4,14 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/constant_propagator.h" +#include "vm/compiler/backend/constant_propagator.h" #include "vm/bit_vector.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/frontend/flow_graph_builder.h" #include "vm/parser.h" #include "vm/symbols.h" diff --git a/runtime/vm/constant_propagator.h b/runtime/vm/compiler/backend/constant_propagator.h similarity index 90% rename from runtime/vm/constant_propagator.h rename to runtime/vm/compiler/backend/constant_propagator.h index e67160f2511..a530ebcfd9c 100644 --- a/runtime/vm/constant_propagator.h +++ b/runtime/vm/compiler/backend/constant_propagator.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_CONSTANT_PROPAGATOR_H_ -#define RUNTIME_VM_CONSTANT_PROPAGATOR_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_CONSTANT_PROPAGATOR_H_ +#define RUNTIME_VM_COMPILER_BACKEND_CONSTANT_PROPAGATOR_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -87,4 +87,4 @@ class ConstantPropagator : public FlowGraphVisitor { } // namespace dart -#endif // RUNTIME_VM_CONSTANT_PROPAGATOR_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_CONSTANT_PROPAGATOR_H_ diff --git a/runtime/vm/flow_graph.cc b/runtime/vm/compiler/backend/flow_graph.cc similarity index 99% rename from runtime/vm/flow_graph.cc rename to runtime/vm/compiler/backend/flow_graph.cc index ffc85c06a24..2cfa068b6e7 100644 --- a/runtime/vm/flow_graph.cc +++ b/runtime/vm/compiler/backend/flow_graph.cc @@ -4,16 +4,16 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph.h" +#include "vm/compiler/backend/flow_graph.h" #include "vm/bit_vector.h" -#include "vm/cha.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/cha.h" +#include "vm/compiler/frontend/flow_graph_builder.h" #include "vm/growable_array.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" #include "vm/object_store.h" namespace dart { diff --git a/runtime/vm/flow_graph.h b/runtime/vm/compiler/backend/flow_graph.h similarity index 98% rename from runtime/vm/flow_graph.h rename to runtime/vm/compiler/backend/flow_graph.h index 82f0610ceea..ae2d6c1a572 100644 --- a/runtime/vm/flow_graph.h +++ b/runtime/vm/compiler/backend/flow_graph.h @@ -2,13 +2,13 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_H_ -#define RUNTIME_VM_FLOW_GRAPH_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_FLOW_GRAPH_H_ +#define RUNTIME_VM_COMPILER_BACKEND_FLOW_GRAPH_H_ #include "vm/bit_vector.h" +#include "vm/compiler/backend/il.h" #include "vm/growable_array.h" #include "vm/hash_map.h" -#include "vm/intermediate_language.h" #include "vm/parser.h" #include "vm/thread.h" @@ -527,4 +527,4 @@ class DefinitionWorklist : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_FLOW_GRAPH_H_ diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/compiler/backend/flow_graph_compiler.cc similarity index 99% rename from runtime/vm/flow_graph_compiler.cc rename to runtime/vm/compiler/backend/flow_graph_compiler.cc index c433d53027e..8204bba6061 100644 --- a/runtime/vm/flow_graph_compiler.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler.cc @@ -6,21 +6,21 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_XXX. -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/bit_vector.h" -#include "vm/cha.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/linearscan.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/cha.h" +#include "vm/compiler/intrinsifier.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/debugger.h" #include "vm/deopt_instructions.h" #include "vm/exceptions.h" #include "vm/flags.h" -#include "vm/flow_graph_allocator.h" -#include "vm/il_printer.h" -#include "vm/intrinsifier.h" #include "vm/kernel_isolate.h" -#include "vm/locations.h" #include "vm/log.h" #include "vm/longjump.h" #include "vm/object_store.h" diff --git a/runtime/vm/flow_graph_compiler.h b/runtime/vm/compiler/backend/flow_graph_compiler.h similarity index 99% rename from runtime/vm/flow_graph_compiler.h rename to runtime/vm/compiler/backend/flow_graph_compiler.h index 08fd3062d31..51a1ed22018 100644 --- a/runtime/vm/flow_graph_compiler.h +++ b/runtime/vm/compiler/backend/flow_graph_compiler.h @@ -2,13 +2,13 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_COMPILER_H_ -#define RUNTIME_VM_FLOW_GRAPH_COMPILER_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_FLOW_GRAPH_COMPILER_H_ +#define RUNTIME_VM_COMPILER_BACKEND_FLOW_GRAPH_COMPILER_H_ #include "vm/allocation.h" -#include "vm/assembler.h" #include "vm/code_descriptors.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/il.h" #include "vm/runtime_entry.h" namespace dart { @@ -840,4 +840,4 @@ class FlowGraphCompiler : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_COMPILER_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_FLOW_GRAPH_COMPILER_H_ diff --git a/runtime/vm/flow_graph_compiler_arm.cc b/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc similarity index 99% rename from runtime/vm/flow_graph_compiler_arm.cc rename to runtime/vm/compiler/backend/flow_graph_compiler_arm.cc index 9fb9e8e6df7..c4c543eb65d 100644 --- a/runtime/vm/flow_graph_compiler_arm.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc @@ -5,16 +5,16 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM. #if defined(TARGET_ARCH_ARM) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/ast_printer.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/deopt_instructions.h" -#include "vm/il_printer.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/flow_graph_compiler_arm64.cc b/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc similarity index 99% rename from runtime/vm/flow_graph_compiler_arm64.cc rename to runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc index f60e400a17f..851ea236957 100644 --- a/runtime/vm/flow_graph_compiler_arm64.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc @@ -5,16 +5,16 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM64. #if defined(TARGET_ARCH_ARM64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/ast_printer.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/deopt_instructions.h" -#include "vm/il_printer.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/flow_graph_compiler_dbc.cc b/runtime/vm/compiler/backend/flow_graph_compiler_dbc.cc similarity index 99% rename from runtime/vm/flow_graph_compiler_dbc.cc rename to runtime/vm/compiler/backend/flow_graph_compiler_dbc.cc index c65b6c91cf8..d53041c10b0 100644 --- a/runtime/vm/flow_graph_compiler_dbc.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler_dbc.cc @@ -5,16 +5,16 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC. #if defined(TARGET_ARCH_DBC) -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/ast_printer.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/deopt_instructions.h" -#include "vm/il_printer.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/flow_graph_compiler_ia32.cc b/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc similarity index 99% rename from runtime/vm/flow_graph_compiler_ia32.cc rename to runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc index dd39d71311e..3d981257b7c 100644 --- a/runtime/vm/flow_graph_compiler_ia32.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc @@ -5,18 +5,18 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_IA32) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/ast_printer.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/deopt_instructions.h" -#include "vm/flow_graph_builder.h" -#include "vm/il_printer.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/flow_graph_compiler_x64.cc b/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc similarity index 99% rename from runtime/vm/flow_graph_compiler_x64.cc rename to runtime/vm/compiler/backend/flow_graph_compiler_x64.cc index b1bad7565be..91f3840a1a2 100644 --- a/runtime/vm/flow_graph_compiler_x64.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc @@ -5,15 +5,15 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64. #if defined(TARGET_ARCH_X64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_compiler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/ast_printer.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/deopt_instructions.h" -#include "vm/il_printer.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/compiler/backend/il.cc similarity index 99% rename from runtime/vm/intermediate_language.cc rename to runtime/vm/compiler/backend/il.cc index 9a86031f9d9..cb9c5168543 100644 --- a/runtime/vm/intermediate_language.cc +++ b/runtime/vm/compiler/backend/il.cc @@ -4,20 +4,20 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" #include "vm/bit_vector.h" #include "vm/bootstrap.h" -#include "vm/compiler.h" -#include "vm/constant_propagator.h" +#include "vm/compiler/backend/constant_propagator.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/linearscan.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" +#include "vm/compiler/method_recognizer.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_allocator.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" -#include "vm/locations.h" -#include "vm/method_recognizer.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/os.h" @@ -27,7 +27,7 @@ #include "vm/stub_code.h" #include "vm/symbols.h" -#include "vm/il_printer.h" +#include "vm/compiler/backend/il_printer.h" namespace dart { diff --git a/runtime/vm/intermediate_language.h b/runtime/vm/compiler/backend/il.h similarity index 99% rename from runtime/vm/intermediate_language.h rename to runtime/vm/compiler/backend/il.h index 961e045f784..03a821d3463 100644 --- a/runtime/vm/intermediate_language.h +++ b/runtime/vm/compiler/backend/il.h @@ -2,15 +2,15 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_INTERMEDIATE_LANGUAGE_H_ -#define RUNTIME_VM_INTERMEDIATE_LANGUAGE_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_IL_H_ +#define RUNTIME_VM_COMPILER_BACKEND_IL_H_ #include "vm/allocation.h" #include "vm/ast.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/method_recognizer.h" #include "vm/flags.h" #include "vm/growable_array.h" -#include "vm/locations.h" -#include "vm/method_recognizer.h" #include "vm/object.h" #include "vm/parser.h" #include "vm/token_position.h" @@ -8069,4 +8069,4 @@ class FlowGraphVisitor : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_INTERMEDIATE_LANGUAGE_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_IL_H_ diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/compiler/backend/il_arm.cc similarity index 99% rename from runtime/vm/intermediate_language_arm.cc rename to runtime/vm/compiler/backend/il_arm.cc index e18e2f092ba..861bf61e028 100644 --- a/runtime/vm/intermediate_language_arm.cc +++ b/runtime/vm/compiler/backend/il_arm.cc @@ -5,16 +5,16 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM. #if defined(TARGET_ARCH_ARM) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/simulator.h" diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/compiler/backend/il_arm64.cc similarity index 99% rename from runtime/vm/intermediate_language_arm64.cc rename to runtime/vm/compiler/backend/il_arm64.cc index b18da61db2e..56a1a40c846 100644 --- a/runtime/vm/intermediate_language_arm64.cc +++ b/runtime/vm/compiler/backend/il_arm64.cc @@ -5,15 +5,15 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM64. #if defined(TARGET_ARCH_ARM64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/simulator.h" diff --git a/runtime/vm/intermediate_language_dbc.cc b/runtime/vm/compiler/backend/il_dbc.cc similarity index 99% rename from runtime/vm/intermediate_language_dbc.cc rename to runtime/vm/compiler/backend/il_dbc.cc index 31857939f29..512b281017c 100644 --- a/runtime/vm/intermediate_language_dbc.cc +++ b/runtime/vm/compiler/backend/il_dbc.cc @@ -5,15 +5,15 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC. #if defined(TARGET_ARCH_DBC) -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/simulator.h" diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/compiler/backend/il_ia32.cc similarity index 99% rename from runtime/vm/intermediate_language_ia32.cc rename to runtime/vm/compiler/backend/il_ia32.cc index 7a8898cbf88..4167143aa2c 100644 --- a/runtime/vm/intermediate_language_ia32.cc +++ b/runtime/vm/compiler/backend/il_ia32.cc @@ -5,15 +5,15 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_IA32) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/il_printer.cc b/runtime/vm/compiler/backend/il_printer.cc similarity index 99% rename from runtime/vm/il_printer.cc rename to runtime/vm/compiler/backend/il_printer.cc index c6a1ba73596..ce206d8c26c 100644 --- a/runtime/vm/il_printer.cc +++ b/runtime/vm/compiler/backend/il_printer.cc @@ -4,10 +4,10 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/il_printer.h" +#include "vm/compiler/backend/il_printer.h" -#include "vm/flow_graph_range_analysis.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/range_analysis.h" #include "vm/os.h" #include "vm/parser.h" diff --git a/runtime/vm/il_printer.h b/runtime/vm/compiler/backend/il_printer.h similarity index 91% rename from runtime/vm/il_printer.h rename to runtime/vm/compiler/backend/il_printer.h index 6d930be69b1..cb6bf64556c 100644 --- a/runtime/vm/il_printer.h +++ b/runtime/vm/compiler/backend/il_printer.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_IL_PRINTER_H_ -#define RUNTIME_VM_IL_PRINTER_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_IL_PRINTER_H_ +#define RUNTIME_VM_COMPILER_BACKEND_IL_PRINTER_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -77,4 +77,4 @@ class FlowGraphPrinter : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_IL_PRINTER_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_IL_PRINTER_H_ diff --git a/runtime/vm/intermediate_language_test.cc b/runtime/vm/compiler/backend/il_test.cc similarity index 97% rename from runtime/vm/intermediate_language_test.cc rename to runtime/vm/compiler/backend/il_test.cc index b6c885315f5..4792e3c984b 100644 --- a/runtime/vm/intermediate_language_test.cc +++ b/runtime/vm/compiler/backend/il_test.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" #include "vm/unit_test.h" namespace dart { diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/compiler/backend/il_x64.cc similarity index 99% rename from runtime/vm/intermediate_language_x64.cc rename to runtime/vm/compiler/backend/il_x64.cc index 2fe4b71bffb..5cda0363531 100644 --- a/runtime/vm/intermediate_language_x64.cc +++ b/runtime/vm/compiler/backend/il_x64.cc @@ -5,15 +5,15 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64. #if defined(TARGET_ARCH_X64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_range_analysis.h" #include "vm/instructions.h" -#include "vm/locations.h" #include "vm/object_store.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/flow_graph_inliner.cc b/runtime/vm/compiler/backend/inliner.cc similarity index 99% rename from runtime/vm/flow_graph_inliner.cc rename to runtime/vm/compiler/backend/inliner.cc index b8f8fb4327f..4220af5d041 100644 --- a/runtime/vm/flow_graph_inliner.cc +++ b/runtime/vm/compiler/backend/inliner.cc @@ -4,25 +4,24 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_inliner.h" +#include "vm/compiler/backend/inliner.h" -#include "vm/aot_optimizer.h" -#include "vm/block_scheduler.h" -#include "vm/branch_optimizer.h" -#include "vm/compiler.h" +#include "vm/compiler/aot/aot_optimizer.h" +#include "vm/compiler/aot/precompiler.h" +#include "vm/compiler/backend/block_scheduler.h" +#include "vm/compiler/backend/branch_optimizer.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/type_propagator.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/frontend/kernel_to_il.h" +#include "vm/compiler/jit/compiler.h" +#include "vm/compiler/jit/jit_optimizer.h" #include "vm/flags.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_type_propagator.h" -#include "vm/il_printer.h" -#include "vm/jit_optimizer.h" #include "vm/kernel.h" -#include "vm/kernel_to_il.h" #include "vm/longjump.h" #include "vm/object.h" #include "vm/object_store.h" -#include "vm/precompiler.h" #include "vm/timer.h" namespace dart { diff --git a/runtime/vm/flow_graph_inliner.h b/runtime/vm/compiler/backend/inliner.h similarity index 95% rename from runtime/vm/flow_graph_inliner.h rename to runtime/vm/compiler/backend/inliner.h index 52be4aba9bb..4fdd65d1ff2 100644 --- a/runtime/vm/flow_graph_inliner.h +++ b/runtime/vm/compiler/backend/inliner.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_INLINER_H_ -#define RUNTIME_VM_FLOW_GRAPH_INLINER_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_INLINER_H_ +#define RUNTIME_VM_COMPILER_BACKEND_INLINER_H_ #include "vm/allocation.h" #include "vm/growable_array.h" @@ -87,4 +87,4 @@ class FlowGraphInliner : ValueObject { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_INLINER_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_INLINER_H_ diff --git a/runtime/vm/flow_graph_allocator.cc b/runtime/vm/compiler/backend/linearscan.cc similarity index 99% rename from runtime/vm/flow_graph_allocator.cc rename to runtime/vm/compiler/backend/linearscan.cc index d49caddda3d..f2be8e0f3a9 100644 --- a/runtime/vm/flow_graph_allocator.cc +++ b/runtime/vm/compiler/backend/linearscan.cc @@ -4,13 +4,13 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_allocator.h" +#include "vm/compiler/backend/linearscan.h" #include "vm/bit_vector.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" #include "vm/log.h" #include "vm/parser.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/flow_graph_allocator.h b/runtime/vm/compiler/backend/linearscan.h similarity index 98% rename from runtime/vm/flow_graph_allocator.h rename to runtime/vm/compiler/backend/linearscan.h index 42ed4807f1d..200597af7a3 100644 --- a/runtime/vm/flow_graph_allocator.h +++ b/runtime/vm/compiler/backend/linearscan.h @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_ALLOCATOR_H_ -#define RUNTIME_VM_FLOW_GRAPH_ALLOCATOR_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_LINEARSCAN_H_ +#define RUNTIME_VM_COMPILER_BACKEND_LINEARSCAN_H_ -#include "vm/flow_graph.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" #include "vm/growable_array.h" -#include "vm/intermediate_language.h" namespace dart { @@ -648,4 +648,4 @@ class LiveRange : public ZoneAllocated { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_ALLOCATOR_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_LINEARSCAN_H_ diff --git a/runtime/vm/locations.cc b/runtime/vm/compiler/backend/locations.cc similarity index 98% rename from runtime/vm/locations.cc rename to runtime/vm/compiler/backend/locations.cc index 3f8ee159248..8c5b8697f11 100644 --- a/runtime/vm/locations.cc +++ b/runtime/vm/compiler/backend/locations.cc @@ -4,10 +4,10 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/locations.h" +#include "vm/compiler/backend/locations.h" -#include "vm/assembler.h" -#include "vm/il_printer.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/il_printer.h" #include "vm/log.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/locations.h b/runtime/vm/compiler/backend/locations.h similarity index 99% rename from runtime/vm/locations.h rename to runtime/vm/compiler/backend/locations.h index e7ac4d640d3..9f5c203f0c8 100644 --- a/runtime/vm/locations.h +++ b/runtime/vm/compiler/backend/locations.h @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_LOCATIONS_H_ -#define RUNTIME_VM_LOCATIONS_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_LOCATIONS_H_ +#define RUNTIME_VM_COMPILER_BACKEND_LOCATIONS_H_ #include "vm/allocation.h" -#include "vm/assembler.h" #include "vm/bitfield.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/log.h" namespace dart { @@ -669,4 +669,4 @@ class LocationSummary : public ZoneAllocated { } // namespace dart -#endif // RUNTIME_VM_LOCATIONS_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_LOCATIONS_H_ diff --git a/runtime/vm/flow_graph_range_analysis.cc b/runtime/vm/compiler/backend/range_analysis.cc similarity index 99% rename from runtime/vm/flow_graph_range_analysis.cc rename to runtime/vm/compiler/backend/range_analysis.cc index 8b21e929af4..0ce8fc2cd93 100644 --- a/runtime/vm/flow_graph_range_analysis.cc +++ b/runtime/vm/compiler/backend/range_analysis.cc @@ -4,10 +4,10 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_range_analysis.h" +#include "vm/compiler/backend/range_analysis.h" #include "vm/bit_vector.h" -#include "vm/il_printer.h" +#include "vm/compiler/backend/il_printer.h" namespace dart { diff --git a/runtime/vm/flow_graph_range_analysis.h b/runtime/vm/compiler/backend/range_analysis.h similarity index 98% rename from runtime/vm/flow_graph_range_analysis.h rename to runtime/vm/compiler/backend/range_analysis.h index 197078db1d6..fd533c42759 100644 --- a/runtime/vm/flow_graph_range_analysis.h +++ b/runtime/vm/compiler/backend/range_analysis.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_RANGE_ANALYSIS_H_ -#define RUNTIME_VM_FLOW_GRAPH_RANGE_ANALYSIS_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_RANGE_ANALYSIS_H_ +#define RUNTIME_VM_COMPILER_BACKEND_RANGE_ANALYSIS_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -632,4 +632,4 @@ class IntegerInstructionSelector : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_RANGE_ANALYSIS_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_RANGE_ANALYSIS_H_ diff --git a/runtime/vm/flow_graph_range_analysis_test.cc b/runtime/vm/compiler/backend/range_analysis_test.cc similarity index 99% rename from runtime/vm/flow_graph_range_analysis_test.cc rename to runtime/vm/compiler/backend/range_analysis_test.cc index 6e01d2a0f5c..4cb15868513 100644 --- a/runtime/vm/flow_graph_range_analysis_test.cc +++ b/runtime/vm/compiler/backend/range_analysis_test.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/flow_graph_range_analysis.h" +#include "vm/compiler/backend/range_analysis.h" #include "vm/unit_test.h" namespace dart { diff --git a/runtime/vm/redundancy_elimination.cc b/runtime/vm/compiler/backend/redundancy_elimination.cc similarity index 99% rename from runtime/vm/redundancy_elimination.cc rename to runtime/vm/compiler/backend/redundancy_elimination.cc index e07c013271b..144e443bbf9 100644 --- a/runtime/vm/redundancy_elimination.cc +++ b/runtime/vm/compiler/backend/redundancy_elimination.cc @@ -4,13 +4,13 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/redundancy_elimination.h" +#include "vm/compiler/backend/redundancy_elimination.h" #include "vm/bit_vector.h" -#include "vm/flow_graph.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" #include "vm/hash_map.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" #include "vm/stack_frame.h" namespace dart { diff --git a/runtime/vm/redundancy_elimination.h b/runtime/vm/compiler/backend/redundancy_elimination.h similarity index 93% rename from runtime/vm/redundancy_elimination.h rename to runtime/vm/compiler/backend/redundancy_elimination.h index b30ef7a918b..fca2590cad2 100644 --- a/runtime/vm/redundancy_elimination.h +++ b/runtime/vm/compiler/backend/redundancy_elimination.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_REDUNDANCY_ELIMINATION_H_ -#define RUNTIME_VM_REDUNDANCY_ELIMINATION_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_REDUNDANCY_ELIMINATION_H_ +#define RUNTIME_VM_COMPILER_BACKEND_REDUNDANCY_ELIMINATION_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -135,4 +135,4 @@ class LICM : public ValueObject { } // namespace dart -#endif // RUNTIME_VM_REDUNDANCY_ELIMINATION_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_REDUNDANCY_ELIMINATION_H_ diff --git a/runtime/vm/flow_graph_type_propagator.cc b/runtime/vm/compiler/backend/type_propagator.cc similarity index 99% rename from runtime/vm/flow_graph_type_propagator.cc rename to runtime/vm/compiler/backend/type_propagator.cc index 71912156270..85e4de5d91b 100644 --- a/runtime/vm/flow_graph_type_propagator.cc +++ b/runtime/vm/compiler/backend/type_propagator.cc @@ -4,11 +4,11 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_type_propagator.h" +#include "vm/compiler/backend/type_propagator.h" #include "vm/bit_vector.h" -#include "vm/cha.h" -#include "vm/il_printer.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/cha.h" #include "vm/object_store.h" #include "vm/regexp_assembler.h" #include "vm/resolver.h" diff --git a/runtime/vm/flow_graph_type_propagator.h b/runtime/vm/compiler/backend/type_propagator.h similarity index 92% rename from runtime/vm/flow_graph_type_propagator.h rename to runtime/vm/compiler/backend/type_propagator.h index 9214e1d6186..cc04661424d 100644 --- a/runtime/vm/flow_graph_type_propagator.h +++ b/runtime/vm/compiler/backend/type_propagator.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_TYPE_PROPAGATOR_H_ -#define RUNTIME_VM_FLOW_GRAPH_TYPE_PROPAGATOR_H_ +#ifndef RUNTIME_VM_COMPILER_BACKEND_TYPE_PROPAGATOR_H_ +#define RUNTIME_VM_COMPILER_BACKEND_TYPE_PROPAGATOR_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -98,4 +98,4 @@ class FlowGraphTypePropagator : public FlowGraphVisitor { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_TYPE_PROPAGATOR_H_ +#endif // RUNTIME_VM_COMPILER_BACKEND_TYPE_PROPAGATOR_H_ diff --git a/runtime/vm/cha.cc b/runtime/vm/compiler/cha.cc similarity index 99% rename from runtime/vm/cha.cc rename to runtime/vm/compiler/cha.cc index a13a83870a6..32a51465cfe 100644 --- a/runtime/vm/cha.cc +++ b/runtime/vm/compiler/cha.cc @@ -4,7 +4,7 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/cha.h" +#include "vm/compiler/cha.h" #include "vm/class_table.h" #include "vm/flags.h" #include "vm/freelist.h" diff --git a/runtime/vm/cha.h b/runtime/vm/compiler/cha.h similarity index 96% rename from runtime/vm/cha.h rename to runtime/vm/compiler/cha.h index 63072d20617..ea49315e0dd 100644 --- a/runtime/vm/cha.h +++ b/runtime/vm/compiler/cha.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_CHA_H_ -#define RUNTIME_VM_CHA_H_ +#ifndef RUNTIME_VM_COMPILER_CHA_H_ +#define RUNTIME_VM_COMPILER_CHA_H_ #include "vm/allocation.h" #include "vm/growable_array.h" @@ -86,4 +86,4 @@ class CHA : public StackResource { } // namespace dart -#endif // RUNTIME_VM_CHA_H_ +#endif // RUNTIME_VM_COMPILER_CHA_H_ diff --git a/runtime/vm/cha_test.cc b/runtime/vm/compiler/cha_test.cc similarity index 99% rename from runtime/vm/cha_test.cc rename to runtime/vm/compiler/cha_test.cc index 978ed918a5e..81025d970a5 100644 --- a/runtime/vm/cha_test.cc +++ b/runtime/vm/compiler/cha_test.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/cha.h" +#include "vm/compiler/cha.h" #include "platform/assert.h" #include "vm/class_finalizer.h" #include "vm/globals.h" diff --git a/runtime/vm/code_generator_test.cc b/runtime/vm/compiler/code_generator_test.cc similarity index 99% rename from runtime/vm/code_generator_test.cc rename to runtime/vm/compiler/code_generator_test.cc index 05b084c9cc0..886e988af0c 100644 --- a/runtime/vm/code_generator_test.cc +++ b/runtime/vm/compiler/code_generator_test.cc @@ -5,10 +5,10 @@ #include "platform/globals.h" #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/ast.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/globals.h" #include "vm/native_entry.h" diff --git a/runtime/vm/compiler/compiler_sources.gni b/runtime/vm/compiler/compiler_sources.gni new file mode 100644 index 00000000000..2504ef4cf18 --- /dev/null +++ b/runtime/vm/compiler/compiler_sources.gni @@ -0,0 +1,103 @@ +# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file +# for details. All rights reserved. Use of this source code is governed by a +# BSD-style license that can be found in the LICENSE file. + +# This file contains all sources (vm and tests) for the compiler pipeline. +# Unit test files need to have a "_test" suffix appended to the name. +compiler_sources = [ + "aot/aot_optimizer.cc", + "aot/aot_optimizer.h", + "aot/precompiler.cc", + "aot/precompiler.h", + "assembler/assembler.cc", + "assembler/assembler.h", + "assembler/assembler_arm.cc", + "assembler/assembler_arm.h", + "assembler/assembler_arm64.cc", + "assembler/assembler_arm64.h", + "assembler/assembler_dbc.cc", + "assembler/assembler_dbc.h", + "assembler/assembler_ia32.cc", + "assembler/assembler_ia32.h", + "assembler/assembler_x64.cc", + "assembler/assembler_x64.h", + "assembler/disassembler.cc", + "assembler/disassembler.h", + "assembler/disassembler_arm.cc", + "assembler/disassembler_arm64.cc", + "assembler/disassembler_dbc.cc", + "assembler/disassembler_ia32.cc", + "assembler/disassembler_x64.cc", + "backend/block_scheduler.cc", + "backend/block_scheduler.h", + "backend/branch_optimizer.cc", + "backend/branch_optimizer.h", + "backend/constant_propagator.cc", + "backend/constant_propagator.h", + "backend/flow_graph.cc", + "backend/flow_graph.h", + "backend/flow_graph_compiler.cc", + "backend/flow_graph_compiler.h", + "backend/flow_graph_compiler_arm.cc", + "backend/flow_graph_compiler_arm64.cc", + "backend/flow_graph_compiler_dbc.cc", + "backend/flow_graph_compiler_ia32.cc", + "backend/flow_graph_compiler_x64.cc", + "backend/il.cc", + "backend/il.h", + "backend/il_arm.cc", + "backend/il_arm64.cc", + "backend/il_dbc.cc", + "backend/il_ia32.cc", + "backend/il_printer.cc", + "backend/il_printer.h", + "backend/il_x64.cc", + "backend/inliner.cc", + "backend/inliner.h", + "backend/linearscan.cc", + "backend/linearscan.h", + "backend/locations.cc", + "backend/locations.h", + "backend/range_analysis.cc", + "backend/range_analysis.h", + "backend/redundancy_elimination.cc", + "backend/redundancy_elimination.h", + "backend/type_propagator.cc", + "backend/type_propagator.h", + "cha.cc", + "cha.h", + "frontend/flow_graph_builder.cc", + "frontend/flow_graph_builder.h", + "frontend/kernel_binary_flowgraph.cc", + "frontend/kernel_binary_flowgraph.h", + "frontend/kernel_to_il.cc", + "frontend/kernel_to_il.h", + "intrinsifier.cc", + "intrinsifier.h", + "intrinsifier_arm.cc", + "intrinsifier_arm64.cc", + "intrinsifier_dbc.cc", + "intrinsifier_ia32.cc", + "intrinsifier_x64.cc", + "jit/compiler.cc", + "jit/compiler.h", + "jit/jit_optimizer.cc", + "jit/jit_optimizer.h", + "method_recognizer.cc", + "method_recognizer.h", +] + +compiler_sources_tests = [ + "assembler/assembler_arm64_test.cc", + "assembler/assembler_arm_test.cc", + "assembler/assembler_dbc_test.cc", + "assembler/assembler_ia32_test.cc", + "assembler/assembler_test.cc", + "assembler/assembler_x64_test.cc", + "assembler/disassembler_test.cc", + "backend/il_test.cc", + "backend/range_analysis_test.cc", + "cha_test.cc", + "code_generator_test.cc", + "frontend/flow_graph_builder_test.cc", +] diff --git a/runtime/vm/flow_graph_builder.cc b/runtime/vm/compiler/frontend/flow_graph_builder.cc similarity index 99% rename from runtime/vm/flow_graph_builder.cc rename to runtime/vm/compiler/frontend/flow_graph_builder.cc index b29e7ab3500..ddd63123044 100644 --- a/runtime/vm/flow_graph_builder.cc +++ b/runtime/vm/compiler/frontend/flow_graph_builder.cc @@ -4,20 +4,20 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/flow_graph_builder.h" +#include "vm/compiler/frontend/flow_graph_builder.h" #include "lib/invocation_mirror.h" #include "vm/ast_printer.h" #include "vm/bit_vector.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/jit/compiler.h" #include "vm/exceptions.h" #include "vm/flags.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_compiler.h" #include "vm/heap.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" #include "vm/isolate.h" #include "vm/object.h" #include "vm/object_store.h" diff --git a/runtime/vm/flow_graph_builder.h b/runtime/vm/compiler/frontend/flow_graph_builder.h similarity index 98% rename from runtime/vm/flow_graph_builder.h rename to runtime/vm/compiler/frontend/flow_graph_builder.h index f195a4e3b06..890747eb89d 100644 --- a/runtime/vm/flow_graph_builder.h +++ b/runtime/vm/compiler/frontend/flow_graph_builder.h @@ -2,16 +2,16 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_FLOW_GRAPH_BUILDER_H_ -#define RUNTIME_VM_FLOW_GRAPH_BUILDER_H_ +#ifndef RUNTIME_VM_COMPILER_FRONTEND_FLOW_GRAPH_BUILDER_H_ +#define RUNTIME_VM_COMPILER_FRONTEND_FLOW_GRAPH_BUILDER_H_ #include "platform/assert.h" #include "platform/globals.h" #include "vm/allocation.h" #include "vm/ast.h" -#include "vm/flow_graph.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" #include "vm/growable_array.h" -#include "vm/intermediate_language.h" #include "vm/raw_object.h" namespace dart { @@ -573,4 +573,4 @@ class TestGraphVisitor : public ValueGraphVisitor { } // namespace dart -#endif // RUNTIME_VM_FLOW_GRAPH_BUILDER_H_ +#endif // RUNTIME_VM_COMPILER_FRONTEND_FLOW_GRAPH_BUILDER_H_ diff --git a/runtime/vm/flow_graph_builder_test.cc b/runtime/vm/compiler/frontend/flow_graph_builder_test.cc similarity index 99% rename from runtime/vm/flow_graph_builder_test.cc rename to runtime/vm/compiler/frontend/flow_graph_builder_test.cc index 24716cff758..3e2e01be978 100644 --- a/runtime/vm/flow_graph_builder_test.cc +++ b/runtime/vm/compiler/frontend/flow_graph_builder_test.cc @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/flow_graph_builder.h" -#include "vm/compiler.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" -#include "vm/intermediate_language.h" #include "vm/unit_test.h" namespace dart { diff --git a/runtime/vm/kernel_binary_flowgraph.cc b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc similarity index 99% rename from runtime/vm/kernel_binary_flowgraph.cc rename to runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc index 167f62177ec..b4d7466d731 100644 --- a/runtime/vm/kernel_binary_flowgraph.cc +++ b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/kernel_binary_flowgraph.h" -#include "vm/compiler.h" +#include "vm/compiler/frontend/kernel_binary_flowgraph.h" +#include "vm/compiler/jit/compiler.h" #include "vm/longjump.h" #include "vm/object_store.h" diff --git a/runtime/vm/kernel_binary_flowgraph.h b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h similarity index 99% rename from runtime/vm/kernel_binary_flowgraph.h rename to runtime/vm/compiler/frontend/kernel_binary_flowgraph.h index 24f2525d914..c493569bff4 100644 --- a/runtime/vm/kernel_binary_flowgraph.h +++ b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h @@ -2,16 +2,16 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_ -#define RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_ +#ifndef RUNTIME_VM_COMPILER_FRONTEND_KERNEL_BINARY_FLOWGRAPH_H_ +#define RUNTIME_VM_COMPILER_FRONTEND_KERNEL_BINARY_FLOWGRAPH_H_ #if !defined(DART_PRECOMPILED_RUNTIME) #include +#include "vm/compiler/frontend/kernel_to_il.h" #include "vm/kernel.h" #include "vm/kernel_binary.h" -#include "vm/kernel_to_il.h" #include "vm/object.h" namespace dart { @@ -1137,4 +1137,4 @@ class AlternativeReadingScope { } // namespace dart #endif // !defined(DART_PRECOMPILED_RUNTIME) -#endif // RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_ +#endif // RUNTIME_VM_COMPILER_FRONTEND_KERNEL_BINARY_FLOWGRAPH_H_ diff --git a/runtime/vm/kernel_to_il.cc b/runtime/vm/compiler/frontend/kernel_to_il.cc similarity index 99% rename from runtime/vm/kernel_to_il.cc rename to runtime/vm/compiler/frontend/kernel_to_il.cc index 14f9d294336..16eb8ab4948 100644 --- a/runtime/vm/kernel_to_il.cc +++ b/runtime/vm/compiler/frontend/kernel_to_il.cc @@ -4,14 +4,13 @@ #include -#include "vm/kernel_to_il.h" +#include "vm/compiler/frontend/kernel_to_il.h" -#include "vm/compiler.h" -#include "vm/intermediate_language.h" -#include "vm/kernel_binary_flowgraph.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/frontend/kernel_binary_flowgraph.h" +#include "vm/compiler/jit/compiler.h" #include "vm/kernel_loader.h" #include "vm/longjump.h" -#include "vm/method_recognizer.h" #include "vm/object_store.h" #include "vm/report.h" #include "vm/resolver.h" diff --git a/runtime/vm/kernel_to_il.h b/runtime/vm/compiler/frontend/kernel_to_il.h similarity index 99% rename from runtime/vm/kernel_to_il.h rename to runtime/vm/compiler/frontend/kernel_to_il.h index 88f23183526..96df636066e 100644 --- a/runtime/vm/kernel_to_il.h +++ b/runtime/vm/compiler/frontend/kernel_to_il.h @@ -2,17 +2,17 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_KERNEL_TO_IL_H_ -#define RUNTIME_VM_KERNEL_TO_IL_H_ +#ifndef RUNTIME_VM_COMPILER_FRONTEND_KERNEL_TO_IL_H_ +#define RUNTIME_VM_COMPILER_FRONTEND_KERNEL_TO_IL_H_ #if !defined(DART_PRECOMPILED_RUNTIME) #include "vm/growable_array.h" #include "vm/hash_map.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_builder.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/frontend/flow_graph_builder.h" namespace dart { namespace kernel { @@ -948,4 +948,4 @@ RawObject* BuildParameterDescriptor(const Function& function); } // namespace dart #endif // !defined(DART_PRECOMPILED_RUNTIME) -#endif // RUNTIME_VM_KERNEL_TO_IL_H_ +#endif // RUNTIME_VM_COMPILER_FRONTEND_KERNEL_TO_IL_H_ diff --git a/runtime/vm/intrinsifier.cc b/runtime/vm/compiler/intrinsifier.cc similarity index 99% rename from runtime/vm/intrinsifier.cc rename to runtime/vm/compiler/intrinsifier.cc index c9943132e58..9d61ce72a8a 100644 --- a/runtime/vm/intrinsifier.cc +++ b/runtime/vm/compiler/intrinsifier.cc @@ -5,18 +5,17 @@ #if !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intrinsifier.h" +#include "vm/compiler/intrinsifier.h" -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/linearscan.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/flags.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_allocator.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" #include "vm/object.h" #include "vm/parser.h" #include "vm/symbols.h" diff --git a/runtime/vm/intrinsifier.h b/runtime/vm/compiler/intrinsifier.h similarity index 90% rename from runtime/vm/intrinsifier.h rename to runtime/vm/compiler/intrinsifier.h index 81d9e65c8f5..2dbc1110358 100644 --- a/runtime/vm/intrinsifier.h +++ b/runtime/vm/compiler/intrinsifier.h @@ -3,11 +3,11 @@ // BSD-style license that can be found in the LICENSE file. // Class for intrinsifying functions. -#ifndef RUNTIME_VM_INTRINSIFIER_H_ -#define RUNTIME_VM_INTRINSIFIER_H_ +#ifndef RUNTIME_VM_COMPILER_INTRINSIFIER_H_ +#define RUNTIME_VM_COMPILER_INTRINSIFIER_H_ #include "vm/allocation.h" -#include "vm/method_recognizer.h" +#include "vm/compiler/method_recognizer.h" namespace dart { @@ -63,4 +63,4 @@ class Intrinsifier : public AllStatic { } // namespace dart -#endif // RUNTIME_VM_INTRINSIFIER_H_ +#endif // RUNTIME_VM_COMPILER_INTRINSIFIER_H_ diff --git a/runtime/vm/intrinsifier_arm.cc b/runtime/vm/compiler/intrinsifier_arm.cc similarity index 99% rename from runtime/vm/intrinsifier_arm.cc rename to runtime/vm/compiler/intrinsifier_arm.cc index 2ed783161ee..ba106f43536 100644 --- a/runtime/vm/intrinsifier_arm.cc +++ b/runtime/vm/compiler/intrinsifier_arm.cc @@ -5,12 +5,12 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM. #if defined(TARGET_ARCH_ARM) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intrinsifier.h" +#include "vm/compiler/intrinsifier.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/regexp_assembler.h" diff --git a/runtime/vm/intrinsifier_arm64.cc b/runtime/vm/compiler/intrinsifier_arm64.cc similarity index 99% rename from runtime/vm/intrinsifier_arm64.cc rename to runtime/vm/compiler/intrinsifier_arm64.cc index 98e4d4ada84..40367ddc3b7 100644 --- a/runtime/vm/intrinsifier_arm64.cc +++ b/runtime/vm/compiler/intrinsifier_arm64.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM64. #if defined(TARGET_ARCH_ARM64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intrinsifier.h" +#include "vm/compiler/intrinsifier.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/regexp_assembler.h" diff --git a/runtime/vm/intrinsifier_dbc.cc b/runtime/vm/compiler/intrinsifier_dbc.cc similarity index 89% rename from runtime/vm/intrinsifier_dbc.cc rename to runtime/vm/compiler/intrinsifier_dbc.cc index 5ffe3a40c0e..77bd035dc0d 100644 --- a/runtime/vm/intrinsifier_dbc.cc +++ b/runtime/vm/compiler/intrinsifier_dbc.cc @@ -5,12 +5,12 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC. #if defined(TARGET_ARCH_DBC) -#include "vm/intrinsifier.h" +#include "vm/compiler/intrinsifier.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/regexp_assembler.h" diff --git a/runtime/vm/intrinsifier_ia32.cc b/runtime/vm/compiler/intrinsifier_ia32.cc similarity index 99% rename from runtime/vm/intrinsifier_ia32.cc rename to runtime/vm/compiler/intrinsifier_ia32.cc index 574d449037c..668bf0a0dfc 100644 --- a/runtime/vm/intrinsifier_ia32.cc +++ b/runtime/vm/compiler/intrinsifier_ia32.cc @@ -11,11 +11,11 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_IA32) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intrinsifier.h" +#include "vm/compiler/intrinsifier.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/os.h" diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/compiler/intrinsifier_x64.cc similarity index 99% rename from runtime/vm/intrinsifier_x64.cc rename to runtime/vm/compiler/intrinsifier_x64.cc index 2a0ffaf3465..b91fe11f380 100644 --- a/runtime/vm/intrinsifier_x64.cc +++ b/runtime/vm/compiler/intrinsifier_x64.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64. #if defined(TARGET_ARCH_X64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/intrinsifier.h" +#include "vm/compiler/intrinsifier.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/instructions.h" #include "vm/object_store.h" #include "vm/regexp_assembler.h" diff --git a/runtime/vm/compiler.cc b/runtime/vm/compiler/jit/compiler.cc similarity index 98% rename from runtime/vm/compiler.cc rename to runtime/vm/compiler/jit/compiler.cc index d1e0b9cd7b5..550fbdc9acd 100644 --- a/runtime/vm/compiler.cc +++ b/runtime/vm/compiler/jit/compiler.cc @@ -2,40 +2,40 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/ast_printer.h" -#include "vm/block_scheduler.h" -#include "vm/branch_optimizer.h" -#include "vm/cha.h" #include "vm/code_patcher.h" -#include "vm/constant_propagator.h" +#include "vm/compiler/aot/precompiler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/backend/block_scheduler.h" +#include "vm/compiler/backend/branch_optimizer.h" +#include "vm/compiler/backend/constant_propagator.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/inliner.h" +#include "vm/compiler/backend/linearscan.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/backend/redundancy_elimination.h" +#include "vm/compiler/backend/type_propagator.h" +#include "vm/compiler/cha.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/frontend/kernel_to_il.h" +#include "vm/compiler/jit/jit_optimizer.h" #include "vm/dart_entry.h" #include "vm/debugger.h" #include "vm/deopt_instructions.h" -#include "vm/disassembler.h" #include "vm/exceptions.h" #include "vm/flags.h" -#include "vm/flow_graph.h" -#include "vm/flow_graph_allocator.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_inliner.h" -#include "vm/flow_graph_range_analysis.h" -#include "vm/flow_graph_type_propagator.h" -#include "vm/il_printer.h" -#include "vm/jit_optimizer.h" #include "vm/kernel.h" -#include "vm/kernel_to_il.h" #include "vm/longjump.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/os.h" #include "vm/parser.h" -#include "vm/precompiler.h" -#include "vm/redundancy_elimination.h" #include "vm/regexp_assembler.h" #include "vm/regexp_parser.h" #include "vm/runtime_entry.h" diff --git a/runtime/vm/compiler.h b/runtime/vm/compiler/jit/compiler.h similarity index 98% rename from runtime/vm/compiler.h rename to runtime/vm/compiler/jit/compiler.h index 4b121af5f43..39ed186f3de 100644 --- a/runtime/vm/compiler.h +++ b/runtime/vm/compiler/jit/compiler.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_COMPILER_H_ -#define RUNTIME_VM_COMPILER_H_ +#ifndef RUNTIME_VM_COMPILER_JIT_COMPILER_H_ +#define RUNTIME_VM_COMPILER_JIT_COMPILER_H_ #include "vm/allocation.h" #include "vm/growable_array.h" @@ -201,4 +201,4 @@ class BackgroundCompiler : public ThreadPool::Task { } // namespace dart -#endif // RUNTIME_VM_COMPILER_H_ +#endif // RUNTIME_VM_COMPILER_JIT_COMPILER_H_ diff --git a/runtime/vm/jit_optimizer.cc b/runtime/vm/compiler/jit/jit_optimizer.cc similarity index 99% rename from runtime/vm/jit_optimizer.cc rename to runtime/vm/compiler/jit/jit_optimizer.cc index ad9664f1a7b..f5afe0c02fe 100644 --- a/runtime/vm/jit_optimizer.cc +++ b/runtime/vm/compiler/jit/jit_optimizer.cc @@ -2,22 +2,22 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. #ifndef DART_PRECOMPILED_RUNTIME -#include "vm/jit_optimizer.h" +#include "vm/compiler/jit/jit_optimizer.h" #include "vm/bit_vector.h" -#include "vm/branch_optimizer.h" -#include "vm/cha.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/branch_optimizer.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/backend/inliner.h" +#include "vm/compiler/backend/range_analysis.h" +#include "vm/compiler/cha.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/exceptions.h" -#include "vm/flow_graph_builder.h" -#include "vm/flow_graph_compiler.h" -#include "vm/flow_graph_inliner.h" -#include "vm/flow_graph_range_analysis.h" #include "vm/hash_map.h" -#include "vm/il_printer.h" -#include "vm/intermediate_language.h" #include "vm/object_store.h" #include "vm/optimizer.h" #include "vm/parser.h" diff --git a/runtime/vm/jit_optimizer.h b/runtime/vm/compiler/jit/jit_optimizer.h similarity index 95% rename from runtime/vm/jit_optimizer.h rename to runtime/vm/compiler/jit/jit_optimizer.h index 11ab0462b3f..d0962f13bcd 100644 --- a/runtime/vm/jit_optimizer.h +++ b/runtime/vm/compiler/jit/jit_optimizer.h @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_JIT_OPTIMIZER_H_ -#define RUNTIME_VM_JIT_OPTIMIZER_H_ +#ifndef RUNTIME_VM_COMPILER_JIT_JIT_OPTIMIZER_H_ +#define RUNTIME_VM_COMPILER_JIT_JIT_OPTIMIZER_H_ -#include "vm/flow_graph.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/flow_graph.h" +#include "vm/compiler/backend/il.h" namespace dart { @@ -131,4 +131,4 @@ class JitOptimizer : public FlowGraphVisitor { } // namespace dart -#endif // RUNTIME_VM_JIT_OPTIMIZER_H_ +#endif // RUNTIME_VM_COMPILER_JIT_JIT_OPTIMIZER_H_ diff --git a/runtime/vm/method_recognizer.cc b/runtime/vm/compiler/method_recognizer.cc similarity index 99% rename from runtime/vm/method_recognizer.cc rename to runtime/vm/compiler/method_recognizer.cc index dc195c6cfda..08d12aa0626 100644 --- a/runtime/vm/method_recognizer.cc +++ b/runtime/vm/compiler/method_recognizer.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/method_recognizer.h" +#include "vm/compiler/method_recognizer.h" #include "vm/object.h" #include "vm/symbols.h" diff --git a/runtime/vm/method_recognizer.h b/runtime/vm/compiler/method_recognizer.h similarity index 99% rename from runtime/vm/method_recognizer.h rename to runtime/vm/compiler/method_recognizer.h index eafc641f39d..fec61de7af9 100644 --- a/runtime/vm/method_recognizer.h +++ b/runtime/vm/compiler/method_recognizer.h @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#ifndef RUNTIME_VM_METHOD_RECOGNIZER_H_ -#define RUNTIME_VM_METHOD_RECOGNIZER_H_ +#ifndef RUNTIME_VM_COMPILER_METHOD_RECOGNIZER_H_ +#define RUNTIME_VM_COMPILER_METHOD_RECOGNIZER_H_ #include "vm/allocation.h" @@ -587,4 +587,4 @@ class FactoryRecognizer : public AllStatic { } // namespace dart -#endif // RUNTIME_VM_METHOD_RECOGNIZER_H_ +#endif // RUNTIME_VM_COMPILER_METHOD_RECOGNIZER_H_ diff --git a/runtime/vm/compiler_test.cc b/runtime/vm/compiler_test.cc index 3448bf50134..6e0e6641953 100644 --- a/runtime/vm/compiler_test.cc +++ b/runtime/vm/compiler_test.cc @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "platform/assert.h" #include "vm/class_finalizer.h" #include "vm/code_patcher.h" diff --git a/runtime/vm/cpu_arm.cc b/runtime/vm/cpu_arm.cc index 981d69f0abe..4988b2185bb 100644 --- a/runtime/vm/cpu_arm.cc +++ b/runtime/vm/cpu_arm.cc @@ -8,7 +8,7 @@ #include "vm/cpu.h" #include "vm/cpu_arm.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpuinfo.h" #include "vm/heap.h" #include "vm/isolate.h" diff --git a/runtime/vm/cpu_ia32.cc b/runtime/vm/cpu_ia32.cc index 5ff61736b7c..475f01ce9a4 100644 --- a/runtime/vm/cpu_ia32.cc +++ b/runtime/vm/cpu_ia32.cc @@ -8,7 +8,7 @@ #include "vm/cpu.h" #include "vm/cpu_ia32.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/constants_ia32.h" #include "vm/cpuinfo.h" #include "vm/heap.h" diff --git a/runtime/vm/cpu_x64.cc b/runtime/vm/cpu_x64.cc index 47637fd7260..55b97544eb4 100644 --- a/runtime/vm/cpu_x64.cc +++ b/runtime/vm/cpu_x64.cc @@ -8,7 +8,7 @@ #include "vm/cpu.h" #include "vm/cpu_x64.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/constants_x64.h" #include "vm/cpuinfo.h" #include "vm/heap.h" diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc index a3903a61ec5..4d857016b62 100644 --- a/runtime/vm/dart_api_impl.cc +++ b/runtime/vm/dart_api_impl.cc @@ -11,7 +11,7 @@ #include "vm/class_finalizer.h" #include "vm/clustered_snapshot.h" #include "vm/compilation_trace.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart.h" #include "vm/dart_api_impl.h" #include "vm/dart_api_message.h" @@ -21,6 +21,7 @@ #if !defined(DART_PRECOMPILED_RUNTIME) #include "vm/kernel_loader.h" #endif +#include "vm/compiler/aot/precompiler.h" #include "vm/exceptions.h" #include "vm/flags.h" #include "vm/growable_array.h" @@ -35,7 +36,6 @@ #include "vm/os.h" #include "vm/os_thread.h" #include "vm/port.h" -#include "vm/precompiler.h" #include "vm/profiler.h" #include "vm/program_visitor.h" #include "vm/resolver.h" diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc index 67ee0c412c9..267871fae57 100644 --- a/runtime/vm/dart_api_impl_test.cc +++ b/runtime/vm/dart_api_impl_test.cc @@ -12,7 +12,7 @@ #include "platform/text_buffer.h" #include "platform/utils.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_state.h" #include "vm/lockers.h" #include "vm/timeline.h" diff --git a/runtime/vm/dart_entry.cc b/runtime/vm/dart_entry.cc index e517fa26992..042860bb505 100644 --- a/runtime/vm/dart_entry.cc +++ b/runtime/vm/dart_entry.cc @@ -5,7 +5,7 @@ #include "vm/dart_entry.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/debugger.h" #include "vm/object_store.h" #include "vm/resolver.h" diff --git a/runtime/vm/dart_entry_test.cc b/runtime/vm/dart_entry_test.cc index 6add7fec017..2e8f5c5f86c 100644 --- a/runtime/vm/dart_entry_test.cc +++ b/runtime/vm/dart_entry_test.cc @@ -5,9 +5,9 @@ #include "platform/globals.h" #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/object.h" #include "vm/resolver.h" diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc index d3315e0280c..448ae1ec726 100644 --- a/runtime/vm/debugger.cc +++ b/runtime/vm/debugger.cc @@ -9,10 +9,10 @@ #include "platform/address_sanitizer.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/deopt_instructions.h" -#include "vm/disassembler.h" #include "vm/flags.h" #include "vm/globals.h" #include "vm/json_stream.h" diff --git a/runtime/vm/debugger_api_impl.cc b/runtime/vm/debugger_api_impl.cc index 5b694a18f15..dc5764344c0 100644 --- a/runtime/vm/debugger_api_impl.cc +++ b/runtime/vm/debugger_api_impl.cc @@ -5,7 +5,7 @@ #include "include/dart_tools_api.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/dart_api_state.h" #include "vm/debugger.h" diff --git a/runtime/vm/debugger_ia32.cc b/runtime/vm/debugger_ia32.cc index ad534bcee61..8dadc22af74 100644 --- a/runtime/vm/debugger_ia32.cc +++ b/runtime/vm/debugger_ia32.cc @@ -8,8 +8,8 @@ #include "vm/debugger.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/disassembler.h" #include "vm/cpu.h" -#include "vm/disassembler.h" #include "vm/object.h" #include "vm/os.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/debugger_x64.cc b/runtime/vm/debugger_x64.cc index 3fbb4133138..a1f395cc633 100644 --- a/runtime/vm/debugger_x64.cc +++ b/runtime/vm/debugger_x64.cc @@ -7,8 +7,8 @@ #include "vm/debugger.h" -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/instructions.h" #include "vm/stub_code.h" diff --git a/runtime/vm/deferred_objects.cc b/runtime/vm/deferred_objects.cc index bff76a6ce07..e900b12e26a 100644 --- a/runtime/vm/deferred_objects.cc +++ b/runtime/vm/deferred_objects.cc @@ -7,7 +7,7 @@ #include "vm/deferred_objects.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/deopt_instructions.h" #include "vm/flags.h" #include "vm/object.h" diff --git a/runtime/vm/deopt_instructions.cc b/runtime/vm/deopt_instructions.cc index 3eea0fa08a9..80e7a1b4d5f 100644 --- a/runtime/vm/deopt_instructions.cc +++ b/runtime/vm/deopt_instructions.cc @@ -6,12 +6,12 @@ #include "vm/deopt_instructions.h" -#include "vm/assembler.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" -#include "vm/disassembler.h" -#include "vm/intermediate_language.h" -#include "vm/locations.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/backend/il.h" +#include "vm/compiler/backend/locations.h" +#include "vm/compiler/jit/compiler.h" #include "vm/parser.h" #include "vm/stack_frame.h" #include "vm/thread.h" diff --git a/runtime/vm/deopt_instructions.h b/runtime/vm/deopt_instructions.h index ea9fe721fb9..38d95fdce33 100644 --- a/runtime/vm/deopt_instructions.h +++ b/runtime/vm/deopt_instructions.h @@ -6,12 +6,12 @@ #define RUNTIME_VM_DEOPT_INSTRUCTIONS_H_ #include "vm/allocation.h" -#include "vm/assembler.h" #include "vm/code_descriptors.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/locations.h" #include "vm/deferred_objects.h" -#include "vm/flow_graph_compiler.h" #include "vm/growable_array.h" -#include "vm/locations.h" #include "vm/object.h" #include "vm/runtime_entry.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/find_code_object_test.cc b/runtime/vm/find_code_object_test.cc index f51cae5074a..980901cadba 100644 --- a/runtime/vm/find_code_object_test.cc +++ b/runtime/vm/find_code_object_test.cc @@ -4,7 +4,7 @@ #include "platform/assert.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/object.h" #include "vm/pages.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/instructions_arm.cc b/runtime/vm/instructions_arm.cc index 0b0bf644820..3002c16076e 100644 --- a/runtime/vm/instructions_arm.cc +++ b/runtime/vm/instructions_arm.cc @@ -8,7 +8,7 @@ #include "vm/instructions.h" #include "vm/instructions_arm.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/constants_arm.h" #include "vm/cpu.h" #include "vm/object.h" diff --git a/runtime/vm/instructions_arm64.cc b/runtime/vm/instructions_arm64.cc index 12b7fcf90a8..f35ae9b5354 100644 --- a/runtime/vm/instructions_arm64.cc +++ b/runtime/vm/instructions_arm64.cc @@ -8,7 +8,7 @@ #include "vm/instructions.h" #include "vm/instructions_arm64.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/constants_arm64.h" #include "vm/cpu.h" #include "vm/object.h" diff --git a/runtime/vm/instructions_arm64_test.cc b/runtime/vm/instructions_arm64_test.cc index 35ba23f92e3..89cca60159b 100644 --- a/runtime/vm/instructions_arm64_test.cc +++ b/runtime/vm/instructions_arm64_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM64) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/instructions.h" #include "vm/stub_code.h" diff --git a/runtime/vm/instructions_arm_test.cc b/runtime/vm/instructions_arm_test.cc index c1077da1264..44749a797b6 100644 --- a/runtime/vm/instructions_arm_test.cc +++ b/runtime/vm/instructions_arm_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/cpu.h" #include "vm/instructions.h" #include "vm/stub_code.h" diff --git a/runtime/vm/instructions_dbc.cc b/runtime/vm/instructions_dbc.cc index 88115c59485..b44cfec4026 100644 --- a/runtime/vm/instructions_dbc.cc +++ b/runtime/vm/instructions_dbc.cc @@ -8,7 +8,7 @@ #include "vm/instructions.h" #include "vm/instructions_dbc.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/constants_dbc.h" #include "vm/cpu.h" #include "vm/object.h" diff --git a/runtime/vm/instructions_ia32_test.cc b/runtime/vm/instructions_ia32_test.cc index bfa42573d11..7aef6cac5f7 100644 --- a/runtime/vm/instructions_ia32_test.cc +++ b/runtime/vm/instructions_ia32_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/instructions.h" #include "vm/object.h" #include "vm/stub_code.h" diff --git a/runtime/vm/instructions_x64_test.cc b/runtime/vm/instructions_x64_test.cc index 5b119db6f62..831d6946a25 100644 --- a/runtime/vm/instructions_x64_test.cc +++ b/runtime/vm/instructions_x64_test.cc @@ -5,7 +5,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_X64) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/instructions.h" #include "vm/stub_code.h" #include "vm/unit_test.h" diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc index 52c3c455377..1e3fe9bac74 100644 --- a/runtime/vm/isolate.cc +++ b/runtime/vm/isolate.cc @@ -11,7 +11,7 @@ #include "vm/atomic.h" #include "vm/class_finalizer.h" #include "vm/code_observers.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/compiler_stats.h" #include "vm/dart_api_message.h" #include "vm/dart_api_state.h" diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc index b65d98dbab9..bc50f850133 100644 --- a/runtime/vm/isolate_reload.cc +++ b/runtime/vm/isolate_reload.cc @@ -6,7 +6,7 @@ #include "vm/become.h" #include "vm/bit_vector.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/hash_table.h" #include "vm/isolate.h" diff --git a/runtime/vm/kernel.cc b/runtime/vm/kernel.cc index 45d6e94d4ed..38b8120ffbf 100644 --- a/runtime/vm/kernel.cc +++ b/runtime/vm/kernel.cc @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. #include "vm/kernel.h" -#include "vm/kernel_binary_flowgraph.h" +#include "vm/compiler/frontend/kernel_binary_flowgraph.h" #if !defined(DART_PRECOMPILED_RUNTIME) namespace dart { diff --git a/runtime/vm/kernel_binary.cc b/runtime/vm/kernel_binary.cc index c3f5c800ccb..e3f45893c5b 100644 --- a/runtime/vm/kernel_binary.cc +++ b/runtime/vm/kernel_binary.cc @@ -5,10 +5,10 @@ #include "vm/kernel_binary.h" #include "platform/globals.h" +#include "vm/compiler/frontend/kernel_to_il.h" #include "vm/flags.h" #include "vm/growable_array.h" #include "vm/kernel.h" -#include "vm/kernel_to_il.h" #include "vm/os.h" namespace dart { diff --git a/runtime/vm/kernel_binary.h b/runtime/vm/kernel_binary.h index 43f8293e86c..066d8626140 100644 --- a/runtime/vm/kernel_binary.h +++ b/runtime/vm/kernel_binary.h @@ -9,8 +9,8 @@ #include +#include "vm/compiler/frontend/kernel_to_il.h" #include "vm/kernel.h" -#include "vm/kernel_to_il.h" #include "vm/object.h" namespace dart { diff --git a/runtime/vm/kernel_isolate.cc b/runtime/vm/kernel_isolate.cc index 60b2440a994..8aa2efb2475 100644 --- a/runtime/vm/kernel_isolate.cc +++ b/runtime/vm/kernel_isolate.cc @@ -6,7 +6,7 @@ #include "bin/dartutils.h" #include "include/dart_native_api.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" #include "vm/isolate.h" diff --git a/runtime/vm/kernel_loader.cc b/runtime/vm/kernel_loader.cc index 0fac655a1de..2f86141c485 100644 --- a/runtime/vm/kernel_loader.cc +++ b/runtime/vm/kernel_loader.cc @@ -6,9 +6,10 @@ #include +#include "vm/compiler/frontend/kernel_binary_flowgraph.h" +#include "vm/compiler/frontend/kernel_to_il.h" #include "vm/dart_api_impl.h" #include "vm/kernel_binary.h" -#include "vm/kernel_to_il.h" #include "vm/longjump.h" #include "vm/object_store.h" #include "vm/parser.h" diff --git a/runtime/vm/kernel_loader.h b/runtime/vm/kernel_loader.h index 0fa0251e6dd..81ca9350766 100644 --- a/runtime/vm/kernel_loader.h +++ b/runtime/vm/kernel_loader.h @@ -8,9 +8,9 @@ #if !defined(DART_PRECOMPILED_RUNTIME) #include +#include "vm/compiler/frontend/kernel_binary_flowgraph.h" +#include "vm/compiler/frontend/kernel_to_il.h" #include "vm/kernel.h" -#include "vm/kernel_binary_flowgraph.h" -#include "vm/kernel_to_il.h" #include "vm/object.h" namespace dart { diff --git a/runtime/vm/native_entry.h b/runtime/vm/native_entry.h index 123b67ec564..1fda0b5c37c 100644 --- a/runtime/vm/native_entry.h +++ b/runtime/vm/native_entry.h @@ -8,7 +8,7 @@ #include "platform/memory_sanitizer.h" #include "vm/allocation.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/exceptions.h" #include "vm/log.h" #include "vm/native_arguments.h" diff --git a/runtime/vm/native_entry_test.cc b/runtime/vm/native_entry_test.cc index 600c3234905..2eae7dd1ca8 100644 --- a/runtime/vm/native_entry_test.cc +++ b/runtime/vm/native_entry_test.cc @@ -4,8 +4,8 @@ #include "vm/native_entry_test.h" -#include "vm/assembler.h" #include "vm/code_patcher.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/dart_api_impl.h" #include "vm/native_entry.h" #include "vm/object.h" diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index 212d0567ca4..7827dc0f73a 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -6,13 +6,17 @@ #include "include/dart_api.h" #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/become.h" #include "vm/bit_vector.h" #include "vm/bootstrap.h" #include "vm/class_finalizer.h" #include "vm/code_observers.h" -#include "vm/compiler.h" +#include "vm/compiler/aot/precompiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/frontend/kernel_to_il.h" +#include "vm/compiler/intrinsifier.h" +#include "vm/compiler/jit/compiler.h" #include "vm/compiler_stats.h" #include "vm/cpu.h" #include "vm/dart.h" @@ -21,19 +25,15 @@ #include "vm/datastream.h" #include "vm/debugger.h" #include "vm/deopt_instructions.h" -#include "vm/disassembler.h" #include "vm/double_conversion.h" #include "vm/exceptions.h" #include "vm/growable_array.h" #include "vm/hash_table.h" #include "vm/heap.h" -#include "vm/intrinsifier.h" #include "vm/isolate_reload.h" -#include "vm/kernel_to_il.h" #include "vm/native_symbol.h" #include "vm/object_store.h" #include "vm/parser.h" -#include "vm/precompiler.h" #include "vm/profiler.h" #include "vm/resolver.h" #include "vm/reusable_handles.h" diff --git a/runtime/vm/object.h b/runtime/vm/object.h index 365d633db99..a10c921cdd4 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -9,6 +9,7 @@ #include "platform/assert.h" #include "platform/utils.h" #include "vm/bitmap.h" +#include "vm/compiler/method_recognizer.h" #include "vm/dart.h" #include "vm/flags.h" #include "vm/globals.h" @@ -17,7 +18,6 @@ #include "vm/heap.h" #include "vm/isolate.h" #include "vm/json_stream.h" -#include "vm/method_recognizer.h" #include "vm/os.h" #include "vm/raw_object.h" #include "vm/report.h" diff --git a/runtime/vm/object_arm64_test.cc b/runtime/vm/object_arm64_test.cc index 5f8635ab725..ac53152d37f 100644 --- a/runtime/vm/object_arm64_test.cc +++ b/runtime/vm/object_arm64_test.cc @@ -6,7 +6,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM64) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/object_arm_test.cc b/runtime/vm/object_arm_test.cc index a0f1f9ac966..4bebaef0404 100644 --- a/runtime/vm/object_arm_test.cc +++ b/runtime/vm/object_arm_test.cc @@ -6,7 +6,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/object_dbc_test.cc b/runtime/vm/object_dbc_test.cc index 688324c4f51..e19b7e46a5b 100644 --- a/runtime/vm/object_dbc_test.cc +++ b/runtime/vm/object_dbc_test.cc @@ -6,7 +6,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_DBC) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/object_ia32_test.cc b/runtime/vm/object_ia32_test.cc index 907efd8570f..e8db74dc17e 100644 --- a/runtime/vm/object_ia32_test.cc +++ b/runtime/vm/object_ia32_test.cc @@ -6,7 +6,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/object_service.cc b/runtime/vm/object_service.cc index 8579966e44b..bd33ac574a3 100644 --- a/runtime/vm/object_service.cc +++ b/runtime/vm/object_service.cc @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +#include "vm/compiler/assembler/disassembler.h" #include "vm/debugger.h" -#include "vm/disassembler.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/stub_code.h" diff --git a/runtime/vm/object_test.cc b/runtime/vm/object_test.cc index 29b5f575805..8ab5ffa2664 100644 --- a/runtime/vm/object_test.cc +++ b/runtime/vm/object_test.cc @@ -4,9 +4,9 @@ #include "platform/globals.h" -#include "vm/assembler.h" #include "vm/class_finalizer.h" #include "vm/code_descriptors.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" #include "vm/debugger.h" diff --git a/runtime/vm/object_x64_test.cc b/runtime/vm/object_x64_test.cc index 8c016cecb5b..fab4bef7cbd 100644 --- a/runtime/vm/object_x64_test.cc +++ b/runtime/vm/object_x64_test.cc @@ -6,7 +6,7 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_X64) -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/optimizer.cc b/runtime/vm/optimizer.cc index 302996ab12e..cda63bee502 100644 --- a/runtime/vm/optimizer.cc +++ b/runtime/vm/optimizer.cc @@ -4,7 +4,7 @@ #include "vm/optimizer.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/backend/il.h" #include "vm/object.h" namespace dart { diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc index 77a3a26b474..f7de6906f53 100644 --- a/runtime/vm/parser.cc +++ b/runtime/vm/parser.cc @@ -12,7 +12,9 @@ #include "vm/ast_transformer.h" #include "vm/bootstrap.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/aot/precompiler.h" +#include "vm/compiler/frontend/kernel_binary_flowgraph.h" +#include "vm/compiler/jit/compiler.h" #include "vm/compiler_stats.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" @@ -21,14 +23,12 @@ #include "vm/hash_table.h" #include "vm/heap.h" #include "vm/isolate.h" -#include "vm/kernel_binary_flowgraph.h" #include "vm/longjump.h" #include "vm/native_arguments.h" #include "vm/native_entry.h" #include "vm/object.h" #include "vm/object_store.h" #include "vm/os.h" -#include "vm/precompiler.h" #include "vm/regexp_assembler.h" #include "vm/resolver.h" #include "vm/safepoint.h" diff --git a/runtime/vm/regexp.h b/runtime/vm/regexp.h index 2577aa933b3..b263166a4f1 100644 --- a/runtime/vm/regexp.h +++ b/runtime/vm/regexp.h @@ -5,9 +5,9 @@ #ifndef RUNTIME_VM_REGEXP_H_ #define RUNTIME_VM_REGEXP_H_ -#include "vm/assembler.h" -#include "vm/flow_graph_compiler.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/backend/il.h" #include "vm/object.h" #include "vm/regexp_assembler.h" diff --git a/runtime/vm/regexp_assembler.h b/runtime/vm/regexp_assembler.h index 4ca94235a10..23d32c71ac3 100644 --- a/runtime/vm/regexp_assembler.h +++ b/runtime/vm/regexp_assembler.h @@ -5,8 +5,8 @@ #ifndef RUNTIME_VM_REGEXP_ASSEMBLER_H_ #define RUNTIME_VM_REGEXP_ASSEMBLER_H_ -#include "vm/assembler.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/il.h" #include "vm/object.h" namespace dart { diff --git a/runtime/vm/regexp_assembler_ir.cc b/runtime/vm/regexp_assembler_ir.cc index b47a7f3d087..cf622ac6393 100644 --- a/runtime/vm/regexp_assembler_ir.cc +++ b/runtime/vm/regexp_assembler_ir.cc @@ -7,10 +7,10 @@ #include "vm/regexp_assembler_ir.h" #include "vm/bit_vector.h" -#include "vm/compiler.h" +#include "vm/compiler/backend/il_printer.h" +#include "vm/compiler/frontend/flow_graph_builder.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_builder.h" -#include "vm/il_printer.h" #include "vm/object_store.h" #include "vm/regexp.h" #include "vm/resolver.h" diff --git a/runtime/vm/regexp_assembler_ir.h b/runtime/vm/regexp_assembler_ir.h index 82a2709c696..f4938491d71 100644 --- a/runtime/vm/regexp_assembler_ir.h +++ b/runtime/vm/regexp_assembler_ir.h @@ -5,8 +5,8 @@ #ifndef RUNTIME_VM_REGEXP_ASSEMBLER_IR_H_ #define RUNTIME_VM_REGEXP_ASSEMBLER_IR_H_ -#include "vm/assembler.h" -#include "vm/intermediate_language.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/il.h" #include "vm/object.h" #include "vm/regexp_assembler.h" diff --git a/runtime/vm/resolver_test.cc b/runtime/vm/resolver_test.cc index 3142f13b166..a6f5597ac78 100644 --- a/runtime/vm/resolver_test.cc +++ b/runtime/vm/resolver_test.cc @@ -4,9 +4,9 @@ #include "vm/resolver.h" #include "platform/assert.h" -#include "vm/assembler.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" #include "vm/object.h" #include "vm/symbols.h" diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc index 13abb3e10a4..cffeabe0098 100644 --- a/runtime/vm/runtime_entry.cc +++ b/runtime/vm/runtime_entry.cc @@ -4,10 +4,10 @@ #include "vm/runtime_entry.h" -#include "vm/assembler.h" #include "vm/ast.h" #include "vm/code_patcher.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" #include "vm/debugger.h" diff --git a/runtime/vm/runtime_entry_arm.cc b/runtime/vm/runtime_entry_arm.cc index 7bfc3b9f49d..8f44e236f0d 100644 --- a/runtime/vm/runtime_entry_arm.cc +++ b/runtime/vm/runtime_entry_arm.cc @@ -7,7 +7,7 @@ #include "vm/runtime_entry.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/simulator.h" #include "vm/stub_code.h" diff --git a/runtime/vm/runtime_entry_arm64.cc b/runtime/vm/runtime_entry_arm64.cc index 2f66bdacb97..04a80e6969f 100644 --- a/runtime/vm/runtime_entry_arm64.cc +++ b/runtime/vm/runtime_entry_arm64.cc @@ -7,7 +7,7 @@ #include "vm/runtime_entry.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/simulator.h" #include "vm/stub_code.h" diff --git a/runtime/vm/runtime_entry_dbc.cc b/runtime/vm/runtime_entry_dbc.cc index 51f93635241..2735003a032 100644 --- a/runtime/vm/runtime_entry_dbc.cc +++ b/runtime/vm/runtime_entry_dbc.cc @@ -7,7 +7,7 @@ #include "vm/runtime_entry.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/simulator.h" #include "vm/stub_code.h" diff --git a/runtime/vm/runtime_entry_ia32.cc b/runtime/vm/runtime_entry_ia32.cc index 2167f1d25d0..917f6cc446a 100644 --- a/runtime/vm/runtime_entry_ia32.cc +++ b/runtime/vm/runtime_entry_ia32.cc @@ -7,7 +7,7 @@ #include "vm/runtime_entry.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/stub_code.h" namespace dart { diff --git a/runtime/vm/runtime_entry_x64.cc b/runtime/vm/runtime_entry_x64.cc index 04bf8562431..f5cb379bb21 100644 --- a/runtime/vm/runtime_entry_x64.cc +++ b/runtime/vm/runtime_entry_x64.cc @@ -7,7 +7,7 @@ #include "vm/runtime_entry.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/stub_code.h" namespace dart { diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc index 59839c2a8b0..dbdd6c772eb 100644 --- a/runtime/vm/service.cc +++ b/runtime/vm/service.cc @@ -8,7 +8,7 @@ #include "include/dart_native_api.h" #include "platform/globals.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_api_impl.h" #include "vm/dart_api_state.h" diff --git a/runtime/vm/service_isolate.cc b/runtime/vm/service_isolate.cc index 593e208f667..05dce8717d3 100644 --- a/runtime/vm/service_isolate.cc +++ b/runtime/vm/service_isolate.cc @@ -4,7 +4,7 @@ #include "vm/service_isolate.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" #include "vm/isolate.h" diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc index 6bf16e029f8..c4819027f5e 100644 --- a/runtime/vm/simulator_arm.cc +++ b/runtime/vm/simulator_arm.cc @@ -13,10 +13,10 @@ #include "vm/simulator.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "vm/constants_arm.h" #include "vm/cpu.h" -#include "vm/disassembler.h" #include "vm/native_arguments.h" #include "vm/os_thread.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/simulator_arm64.cc b/runtime/vm/simulator_arm64.cc index 5d74122dd50..3badfac6e8e 100644 --- a/runtime/vm/simulator_arm64.cc +++ b/runtime/vm/simulator_arm64.cc @@ -13,9 +13,9 @@ #include "vm/simulator.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "vm/constants_arm64.h" -#include "vm/disassembler.h" #include "vm/native_arguments.h" #include "vm/os_thread.h" #include "vm/stack_frame.h" diff --git a/runtime/vm/simulator_dbc.cc b/runtime/vm/simulator_dbc.cc index 215fb04d26f..32995570c69 100644 --- a/runtime/vm/simulator_dbc.cc +++ b/runtime/vm/simulator_dbc.cc @@ -14,13 +14,13 @@ #include "vm/simulator.h" -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/constants_dbc.h" #include "vm/cpu.h" #include "vm/dart_entry.h" #include "vm/debugger.h" -#include "vm/disassembler.h" #include "vm/lockers.h" #include "vm/native_arguments.h" #include "vm/native_entry.h" diff --git a/runtime/vm/simulator_dbc.h b/runtime/vm/simulator_dbc.h index d068eeecb76..85b8dc89bb5 100644 --- a/runtime/vm/simulator_dbc.h +++ b/runtime/vm/simulator_dbc.h @@ -9,8 +9,8 @@ #error Do not include simulator_dbc.h directly; use simulator.h. #endif +#include "vm/compiler/method_recognizer.h" #include "vm/constants_dbc.h" -#include "vm/method_recognizer.h" namespace dart { diff --git a/runtime/vm/source_report.cc b/runtime/vm/source_report.cc index 6baf9ce0858..ab8c0d9f8ec 100644 --- a/runtime/vm/source_report.cc +++ b/runtime/vm/source_report.cc @@ -4,7 +4,7 @@ #ifndef PRODUCT #include "vm/source_report.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/isolate.h" #include "vm/object.h" #include "vm/object_store.h" diff --git a/runtime/vm/stack_frame.cc b/runtime/vm/stack_frame.cc index f0d0173fb9e..24c9de4946f 100644 --- a/runtime/vm/stack_frame.cc +++ b/runtime/vm/stack_frame.cc @@ -5,7 +5,7 @@ #include "vm/stack_frame.h" #include "platform/memory_sanitizer.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" #include "vm/deopt_instructions.h" #include "vm/isolate.h" #include "vm/object.h" diff --git a/runtime/vm/stack_frame_test.cc b/runtime/vm/stack_frame_test.cc index 1ea01f44717..e6bcb67ef07 100644 --- a/runtime/vm/stack_frame_test.cc +++ b/runtime/vm/stack_frame_test.cc @@ -6,7 +6,7 @@ #include "include/dart_api.h" #include "platform/assert.h" #include "vm/class_finalizer.h" -#include "vm/compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" #include "vm/dart_entry.h" #include "vm/resolver.h" diff --git a/runtime/vm/stub_code.cc b/runtime/vm/stub_code.cc index 6b5345407cb..f70090aa90e 100644 --- a/runtime/vm/stub_code.cc +++ b/runtime/vm/stub_code.cc @@ -6,9 +6,9 @@ #include "platform/assert.h" #include "platform/globals.h" -#include "vm/assembler.h" #include "vm/clustered_snapshot.h" -#include "vm/disassembler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" #include "vm/flags.h" #include "vm/object_store.h" #include "vm/safepoint.h" diff --git a/runtime/vm/stub_code.h b/runtime/vm/stub_code.h index c3627696e1d..4d2b5836124 100644 --- a/runtime/vm/stub_code.h +++ b/runtime/vm/stub_code.h @@ -6,7 +6,7 @@ #define RUNTIME_VM_STUB_CODE_H_ #include "vm/allocation.h" -#include "vm/assembler.h" +#include "vm/compiler/assembler/assembler.h" namespace dart { diff --git a/runtime/vm/stub_code_arm.cc b/runtime/vm/stub_code_arm.cc index 52cf06f78ba..6795712934c 100644 --- a/runtime/vm/stub_code_arm.cc +++ b/runtime/vm/stub_code_arm.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/heap.h" #include "vm/instructions.h" #include "vm/object_store.h" diff --git a/runtime/vm/stub_code_arm64.cc b/runtime/vm/stub_code_arm64.cc index c52beb56b31..86469e29c7e 100644 --- a/runtime/vm/stub_code_arm64.cc +++ b/runtime/vm/stub_code_arm64.cc @@ -5,10 +5,10 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_ARM64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/heap.h" #include "vm/instructions.h" #include "vm/object_store.h" diff --git a/runtime/vm/stub_code_dbc.cc b/runtime/vm/stub_code_dbc.cc index decb6701fcd..a187debe050 100644 --- a/runtime/vm/stub_code_dbc.cc +++ b/runtime/vm/stub_code_dbc.cc @@ -5,11 +5,11 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_DBC) -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/cpu.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/heap.h" #include "vm/instructions.h" #include "vm/object_store.h" diff --git a/runtime/vm/stub_code_ia32.cc b/runtime/vm/stub_code_ia32.cc index 2509415d389..e2d2889417e 100644 --- a/runtime/vm/stub_code_ia32.cc +++ b/runtime/vm/stub_code_ia32.cc @@ -5,10 +5,10 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/heap.h" #include "vm/instructions.h" #include "vm/object_store.h" diff --git a/runtime/vm/stub_code_x64.cc b/runtime/vm/stub_code_x64.cc index e2e3fba8c4a..34382963a73 100644 --- a/runtime/vm/stub_code_x64.cc +++ b/runtime/vm/stub_code_x64.cc @@ -5,10 +5,10 @@ #include "vm/globals.h" #if defined(TARGET_ARCH_X64) && !defined(DART_PRECOMPILED_RUNTIME) -#include "vm/assembler.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/backend/flow_graph_compiler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_entry.h" -#include "vm/flow_graph_compiler.h" #include "vm/heap.h" #include "vm/instructions.h" #include "vm/object_store.h" diff --git a/runtime/vm/unit_test.cc b/runtime/vm/unit_test.cc index 3556ea3c574..ce3d337f8cd 100644 --- a/runtime/vm/unit_test.cc +++ b/runtime/vm/unit_test.cc @@ -12,11 +12,11 @@ #include "platform/globals.h" -#include "vm/assembler.h" #include "vm/ast_printer.h" -#include "vm/compiler.h" +#include "vm/compiler/assembler/assembler.h" +#include "vm/compiler/assembler/disassembler.h" +#include "vm/compiler/jit/compiler.h" #include "vm/dart_api_impl.h" -#include "vm/disassembler.h" #include "vm/isolate_reload.h" #include "vm/parser.h" #include "vm/symbols.h" diff --git a/runtime/vm/vm_sources.gni b/runtime/vm/vm_sources.gni index a95f070de8d..c33722d784a 100644 --- a/runtime/vm/vm_sources.gni +++ b/runtime/vm/vm_sources.gni @@ -7,20 +7,6 @@ vm_sources = [ "allocation.cc", "allocation.h", - "aot_optimizer.cc", - "aot_optimizer.h", - "assembler.cc", - "assembler.h", - "assembler_arm.cc", - "assembler_arm.h", - "assembler_arm64.cc", - "assembler_arm64.h", - "assembler_dbc.cc", - "assembler_dbc.h", - "assembler_ia32.cc", - "assembler_ia32.h", - "assembler_x64.cc", - "assembler_x64.h", "ast.cc", "ast.h", "ast_printer.cc", @@ -34,23 +20,17 @@ vm_sources = [ "atomic_macos.h", "atomic_win.h", "base_isolate.h", - "become.h", "become.cc", + "become.h", "bit_vector.cc", "bit_vector.h", "bitfield.h", "bitmap.cc", "bitmap.h", - "block_scheduler.cc", - "block_scheduler.h", "boolfield.h", "bootstrap.h", "bootstrap_natives.cc", "bootstrap_natives.h", - "branch_optimizer.cc", - "branch_optimizer.h", - "cha.cc", - "cha.h", "class_finalizer.cc", "class_finalizer.h", "class_table.cc", @@ -70,12 +50,8 @@ vm_sources = [ "code_patcher_x64.cc", "compilation_trace.cc", "compilation_trace.h", - "compiler.cc", - "compiler.h", "compiler_stats.cc", "compiler_stats.h", - "constant_propagator.h", - "constant_propagator.cc", "constants_arm.h", "constants_arm64.h", "constants_ia32.h", @@ -86,8 +62,8 @@ vm_sources = [ "cpu_dbc.cc", "cpu_ia32.cc", "cpu_x64.cc", - "cpuid.h", "cpuid.cc", + "cpuid.h", "cpuinfo.h", "cpuinfo_android.cc", "cpuinfo_fuchsia.cc", @@ -115,13 +91,6 @@ vm_sources = [ "deferred_objects.h", "deopt_instructions.cc", "deopt_instructions.h", - "disassembler.cc", - "disassembler.h", - "disassembler_arm.cc", - "disassembler_arm64.cc", - "disassembler_dbc.cc", - "disassembler_ia32.cc", - "disassembler_x64.cc", "double_conversion.cc", "double_conversion.h", "double_internals.h", @@ -133,25 +102,6 @@ vm_sources = [ "flag_list.h", "flags.cc", "flags.h", - "flow_graph.cc", - "flow_graph.h", - "flow_graph_allocator.cc", - "flow_graph_allocator.h", - "flow_graph_builder.cc", - "flow_graph_builder.h", - "flow_graph_compiler.cc", - "flow_graph_compiler.h", - "flow_graph_compiler_arm.cc", - "flow_graph_compiler_arm64.cc", - "flow_graph_compiler_dbc.cc", - "flow_graph_compiler_ia32.cc", - "flow_graph_compiler_x64.cc", - "flow_graph_inliner.cc", - "flow_graph_inliner.h", - "flow_graph_range_analysis.cc", - "flow_graph_range_analysis.h", - "flow_graph_type_propagator.cc", - "flow_graph_type_propagator.h", "freelist.cc", "freelist.h", "gc_marker.cc", @@ -168,8 +118,6 @@ vm_sources = [ "hash_table.h", "heap.cc", "heap.h", - "il_printer.cc", - "il_printer.h", "instructions.h", "instructions_arm.cc", "instructions_arm.h", @@ -181,47 +129,35 @@ vm_sources = [ "instructions_ia32.h", "instructions_x64.cc", "instructions_x64.h", - "intermediate_language.cc", - "intermediate_language.h", - "intermediate_language_arm.cc", - "intermediate_language_arm64.cc", - "intermediate_language_dbc.cc", - "intermediate_language_ia32.cc", - "intermediate_language_x64.cc", - "intrinsifier.cc", - "intrinsifier.h", - "intrinsifier_arm.cc", - "intrinsifier_arm64.cc", - "intrinsifier_dbc.cc", - "intrinsifier_ia32.cc", - "intrinsifier_x64.cc", "isolate.cc", "isolate.h", "isolate_reload.cc", "isolate_reload.h", - "jit_optimizer.cc", - "jit_optimizer.h", "json_parser.h", - "json_stream.h", "json_stream.cc", + "json_stream.h", + "kernel.cc", + "kernel.h", + "kernel_binary.cc", + "kernel_binary.h", "kernel_isolate.cc", "kernel_isolate.h", - "locations.cc", - "locations.h", + "kernel_loader.cc", + "kernel_loader.h", "lockers.cc", "lockers.h", "log.cc", "log.h", "longjump.cc", "longjump.h", - "malloc_hooks_jemalloc.cc", - "malloc_hooks_tcmalloc.cc", + "malloc_hooks.h", "malloc_hooks_arm.cc", "malloc_hooks_arm64.cc", "malloc_hooks_ia32.cc", - "malloc_hooks_x64.cc", - "malloc_hooks.h", + "malloc_hooks_jemalloc.cc", + "malloc_hooks_tcmalloc.cc", "malloc_hooks_unsupported.cc", + "malloc_hooks_x64.cc", "megamorphic_cache_table.cc", "megamorphic_cache_table.h", "memory_region.cc", @@ -230,8 +166,6 @@ vm_sources = [ "message.h", "message_handler.cc", "message_handler.h", - "method_recognizer.cc", - "method_recognizer.h", "metrics.cc", "metrics.h", "native_arguments.h", @@ -282,33 +216,19 @@ vm_sources = [ "parser.h", "port.cc", "port.h", - "precompiler.cc", - "precompiler.h", - "program_visitor.cc", - "program_visitor.h", - "kernel.h", - "kernel.cc", - "kernel_binary.cc", - "kernel_binary.h", - "kernel_binary_flowgraph.cc", - "kernel_binary_flowgraph.h", - "kernel_loader.h", - "kernel_loader.cc", - "kernel_to_il.cc", - "kernel_to_il.h", "proccpuinfo.cc", "proccpuinfo.h", - "profiler_service.cc", - "profiler_service.h", "profiler.cc", "profiler.h", + "profiler_service.cc", + "profiler_service.h", + "program_visitor.cc", + "program_visitor.h", "random.cc", "random.h", "raw_object.cc", "raw_object.h", "raw_object_snapshot.cc", - "redundancy_elimination.cc", - "redundancy_elimination.h", "regexp.cc", "regexp.h", "regexp_assembler.cc", @@ -331,13 +251,13 @@ vm_sources = [ "resolver.h", "reusable_handles.h", "ring_buffer.h", + "runtime_entry.cc", "runtime_entry.h", - "runtime_entry_list.h", "runtime_entry_arm.cc", "runtime_entry_arm64.cc", "runtime_entry_dbc.cc", "runtime_entry_ia32.cc", - "runtime_entry.cc", + "runtime_entry_list.h", "runtime_entry_x64.cc", "safepoint.cc", "safepoint.h", @@ -354,12 +274,12 @@ vm_sources = [ "service_event.h", "service_isolate.cc", "service_isolate.h", + "signal_handler.h", "signal_handler_android.cc", "signal_handler_fuchsia.cc", "signal_handler_linux.cc", "signal_handler_macos.cc", "signal_handler_win.cc", - "signal_handler.h", "simulator.h", "simulator_arm.cc", "simulator_arm.h", @@ -424,9 +344,9 @@ vm_sources = [ "token_position.cc", "token_position.h", "type_table.h", + "unibrow-inl.h", "unibrow.cc", "unibrow.h", - "unibrow-inl.h", "unicode.cc", "unicode.h", "unicode_data.cc", @@ -454,12 +374,6 @@ vm_sources = [ vm_sources_tests = [ "allocation_test.cc", - "assembler_arm_test.cc", - "assembler_arm64_test.cc", - "assembler_dbc_test.cc", - "assembler_ia32_test.cc", - "assembler_test.cc", - "assembler_x64_test.cc", "assert_test.cc", "ast_printer_test.cc", "ast_test.cc", @@ -472,12 +386,10 @@ vm_sources_tests = [ "bitfield_test.cc", "bitmap_test.cc", "boolfield_test.cc", - "cha_test.cc", "class_finalizer_test.cc", "code_descriptors_test.cc", - "code_generator_test.cc", - "code_patcher_arm_test.cc", "code_patcher_arm64_test.cc", + "code_patcher_arm_test.cc", "code_patcher_ia32_test.cc", "code_patcher_x64_test.cc", "compiler_test.cc", @@ -486,15 +398,12 @@ vm_sources_tests = [ "custom_isolate_test.cc", "dart_api_impl_test.cc", "dart_entry_test.cc", - "debugger_test.cc", "debugger_api_impl_test.cc", - "disassembler_test.cc", + "debugger_test.cc", "exceptions_test.cc", "find_code_object_test.cc", "fixed_cache_test.cc", "flags_test.cc", - "flow_graph_builder_test.cc", - "flow_graph_range_analysis_test.cc", "freelist_test.cc", "growable_array_test.cc", "guard_field_test.cc", @@ -502,11 +411,10 @@ vm_sources_tests = [ "hash_map_test.cc", "hash_table_test.cc", "heap_test.cc", - "instructions_arm_test.cc", "instructions_arm64_test.cc", + "instructions_arm_test.cc", "instructions_ia32_test.cc", "instructions_x64_test.cc", - "intermediate_language_test.cc", "isolate_reload_test.cc", "isolate_test.cc", "json_test.cc", @@ -519,8 +427,8 @@ vm_sources_tests = [ "metrics_test.cc", "native_entry_test.cc", "native_entry_test.h", - "object_arm_test.cc", "object_arm64_test.cc", + "object_arm_test.cc", "object_dbc_test.cc", "object_graph_test.cc", "object_ia32_test.cc", @@ -543,8 +451,8 @@ vm_sources_tests = [ "snapshot_test.cc", "source_report_test.cc", "stack_frame_test.cc", - "stub_code_arm_test.cc", "stub_code_arm64_test.cc", + "stub_code_arm_test.cc", "stub_code_ia32_test.cc", "stub_code_x64_test.cc", "thread_barrier_test.cc",