diff options
Diffstat (limited to 'compiler')
64 files changed, 64 insertions, 50 deletions
diff --git a/compiler/compiled_method.h b/compiler/compiled_method.h index 480d021db0..45a62bc6c7 100644 --- a/compiler/compiled_method.h +++ b/compiler/compiled_method.h @@ -22,8 +22,8 @@ #include <vector> #include "arch/instruction_set.h" +#include "base/bit_utils.h" #include "method_reference.h" -#include "utils.h" #include "utils/array_ref.h" #include "utils/swap_space.h" diff --git a/compiler/compiler.cc b/compiler/compiler.cc index 5e8ec1e01b..223affad82 100644 --- a/compiler/compiler.cc +++ b/compiler/compiler.cc @@ -20,6 +20,7 @@ #include "dex/quick/quick_compiler_factory.h" #include "driver/compiler_driver.h" #include "optimizing/optimizing_compiler.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/compiler_ir.cc b/compiler/dex/compiler_ir.cc index 7fc1b03035..6e1853bbd7 100644 --- a/compiler/dex/compiler_ir.cc +++ b/compiler/dex/compiler_ir.cc @@ -22,6 +22,7 @@ #include "dex/quick/mir_to_lir.h" #include "driver/compiler_driver.h" #include "mir_graph.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/compiler_ir.h b/compiler/dex/compiler_ir.h index dceea240fa..d28df1dcce 100644 --- a/compiler/dex/compiler_ir.h +++ b/compiler/dex/compiler_ir.h @@ -21,6 +21,7 @@ #include <string> #include <vector> +#include "arch/instruction_set.h" #include "base/arena_allocator.h" #include "base/scoped_arena_allocator.h" #include "base/timing_logger.h" @@ -31,6 +32,7 @@ namespace art { class ClassLinker; class CompilerDriver; +class DexFile; class Mir2Lir; class MIRGraph; diff --git a/compiler/dex/local_value_numbering.cc b/compiler/dex/local_value_numbering.cc index cc9dbe4adb..38f7d1e712 100644 --- a/compiler/dex/local_value_numbering.cc +++ b/compiler/dex/local_value_numbering.cc @@ -16,9 +16,11 @@ #include "local_value_numbering.h" +#include "base/bit_utils.h" #include "global_value_numbering.h" #include "mir_field_info.h" #include "mir_graph.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h index 67fb647eba..dff5e27521 100644 --- a/compiler/dex/local_value_numbering.h +++ b/compiler/dex/local_value_numbering.h @@ -106,8 +106,7 @@ class LocalValueNumbering : public DeletableArenaObject<kArenaAllocMisc> { } void SetOperandValueImpl(uint16_t s_reg, uint16_t value, SregValueMap* map) { - DCHECK_EQ(map->count(s_reg), 0u) << PrettyMethod(gvn_->cu_->method_idx, *gvn_->cu_->dex_file) - << " LVN id: " << id_ << ", s_reg: " << s_reg; + DCHECK_EQ(map->count(s_reg), 0u); map->Put(s_reg, value); } diff --git a/compiler/dex/mir_analysis.cc b/compiler/dex/mir_analysis.cc index 9099e8a54d..1cff8dc50c 100644 --- a/compiler/dex/mir_analysis.cc +++ b/compiler/dex/mir_analysis.cc @@ -30,6 +30,7 @@ #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index 1871f07106..9fa5148ced 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -35,6 +35,7 @@ #include "leb128.h" #include "pass_driver_me_post_opt.h" #include "stack.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h index 7385a8bd53..f038397e1e 100644 --- a/compiler/dex/mir_graph.h +++ b/compiler/dex/mir_graph.h @@ -20,6 +20,7 @@ #include <stdint.h> #include "base/arena_containers.h" +#include "base/bit_utils.h" #include "base/scoped_arena_containers.h" #include "dex_file.h" #include "dex_instruction.h" diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index 217dbeeb44..7679db8bac 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc @@ -31,6 +31,7 @@ #include "quick/dex_file_to_method_inliner_map.h" #include "stack.h" #include "type_inference.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/quick/arm/call_arm.cc b/compiler/dex/quick/arm/call_arm.cc index 2b2d6af326..822ea2106f 100644 --- a/compiler/dex/quick/arm/call_arm.cc +++ b/compiler/dex/quick/arm/call_arm.cc @@ -19,6 +19,7 @@ #include "codegen_arm.h" #include "arm_lir.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "dex/mir_graph.h" #include "dex/quick/dex_file_to_method_inliner_map.h" @@ -29,7 +30,6 @@ #include "mirror/art_method.h" #include "mirror/object_array-inl.h" #include "entrypoints/quick/quick_entrypoints.h" -#include "utils.h" #include "utils/dex_cache_arrays_layout-inl.h" namespace art { diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index 7598e50977..7de8e55e56 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -20,6 +20,7 @@ #include "arch/instruction_set_features.h" #include "arm_lir.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "dex/compiler_ir.h" #include "dex/mir_graph.h" @@ -28,7 +29,6 @@ #include "driver/compiler_driver.h" #include "entrypoints/quick/quick_entrypoints.h" #include "mirror/array-inl.h" -#include "utils.h" namespace art { diff --git a/compiler/dex/quick/arm64/fp_arm64.cc b/compiler/dex/quick/arm64/fp_arm64.cc index 49b15fef58..3b88021361 100644 --- a/compiler/dex/quick/arm64/fp_arm64.cc +++ b/compiler/dex/quick/arm64/fp_arm64.cc @@ -20,7 +20,6 @@ #include "base/logging.h" #include "dex/mir_graph.h" #include "dex/quick/mir_to_lir-inl.h" -#include "utils.h" namespace art { diff --git a/compiler/dex/quick/arm64/int_arm64.cc b/compiler/dex/quick/arm64/int_arm64.cc index 9340d01640..08aa5d20d0 100644 --- a/compiler/dex/quick/arm64/int_arm64.cc +++ b/compiler/dex/quick/arm64/int_arm64.cc @@ -20,6 +20,7 @@ #include "arch/instruction_set_features.h" #include "arm64_lir.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "dex/compiler_ir.h" #include "dex/mir_graph.h" @@ -28,7 +29,6 @@ #include "driver/compiler_driver.h" #include "entrypoints/quick/quick_entrypoints.h" #include "mirror/array-inl.h" -#include "utils.h" namespace art { diff --git a/compiler/dex/quick/gen_common.cc b/compiler/dex/quick/gen_common.cc index 0592c74181..63f83f94cf 100644 --- a/compiler/dex/quick/gen_common.cc +++ b/compiler/dex/quick/gen_common.cc @@ -19,6 +19,7 @@ #include <functional> #include "arch/arm/instruction_set_features_arm.h" +#include "base/bit_utils.h" #include "base/macros.h" #include "dex/compiler_ir.h" #include "dex/mir_graph.h" @@ -30,7 +31,6 @@ #include "mirror/object_array-inl.h" #include "mirror/object-inl.h" #include "mirror/object_reference.h" -#include "utils.h" #include "utils/dex_cache_arrays_layout-inl.h" #include "verifier/method_verifier.h" diff --git a/compiler/dex/quick/mir_to_lir-inl.h b/compiler/dex/quick/mir_to_lir-inl.h index 280dbbe106..767fe250d8 100644 --- a/compiler/dex/quick/mir_to_lir-inl.h +++ b/compiler/dex/quick/mir_to_lir-inl.h @@ -21,6 +21,7 @@ #include "base/logging.h" #include "dex/compiler_ir.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/quick/mir_to_lir.h b/compiler/dex/quick/mir_to_lir.h index 4fdc7289bf..d54616f47c 100644 --- a/compiler/dex/quick/mir_to_lir.h +++ b/compiler/dex/quick/mir_to_lir.h @@ -31,6 +31,7 @@ #include "invoke_type.h" #include "lazy_debug_frame_opcode_writer.h" #include "leb128.h" +#include "primitive.h" #include "safe_map.h" #include "utils/array_ref.h" #include "utils/dex_cache_arrays_layout.h" diff --git a/compiler/dex/quick/resource_mask.cc b/compiler/dex/quick/resource_mask.cc index 57e8af32a2..817a69aa3b 100644 --- a/compiler/dex/quick/resource_mask.cc +++ b/compiler/dex/quick/resource_mask.cc @@ -18,9 +18,9 @@ #include "resource_mask.h" +#include "base/bit_utils.h" #include "base/arena_allocator.h" #include "base/logging.h" -#include "utils.h" namespace art { diff --git a/compiler/dex/quick/x86/assemble_x86.cc b/compiler/dex/quick/x86/assemble_x86.cc index 8467b718a1..12523aca76 100644 --- a/compiler/dex/quick/x86/assemble_x86.cc +++ b/compiler/dex/quick/x86/assemble_x86.cc @@ -16,10 +16,12 @@ #include "codegen_x86.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "dex/compiler_ir.h" #include "dex/quick/mir_to_lir.h" #include "oat.h" +#include "utils.h" #include "x86_lir.h" namespace art { diff --git a/compiler/dex/quick/x86/int_x86.cc b/compiler/dex/quick/x86/int_x86.cc index 943bfc0300..9bbb5f84be 100755 --- a/compiler/dex/quick/x86/int_x86.cc +++ b/compiler/dex/quick/x86/int_x86.cc @@ -18,12 +18,12 @@ #include "codegen_x86.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "dex/quick/mir_to_lir-inl.h" #include "dex/reg_storage_eq.h" #include "mirror/art_method.h" #include "mirror/array-inl.h" -#include "utils.h" #include "x86_lir.h" namespace art { diff --git a/compiler/dex/type_inference.cc b/compiler/dex/type_inference.cc index 19d591ba41..cd6467f4e5 100644 --- a/compiler/dex/type_inference.cc +++ b/compiler/dex/type_inference.cc @@ -25,6 +25,7 @@ #include "mir_field_info.h" #include "mir_graph.h" #include "mir_method_info.h" +#include "utils.h" namespace art { diff --git a/compiler/dex/type_inference.h b/compiler/dex/type_inference.h index c9b29bf7aa..85f79af36e 100644 --- a/compiler/dex/type_inference.h +++ b/compiler/dex/type_inference.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_DEX_TYPE_INFERENCE_H_ #define ART_COMPILER_DEX_TYPE_INFERENCE_H_ +#include "base/bit_utils.h" #include "base/logging.h" #include "base/arena_object.h" #include "base/scoped_arena_containers.h" diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index d352f39fbc..f988812d73 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -29,6 +29,7 @@ #include "art_field-inl.h" #include "base/stl_util.h" +#include "base/time_utils.h" #include "base/timing_logger.h" #include "class_linker-inl.h" #include "compiled_class.h" diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 2b0985a77e..2cc2409a34 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -24,6 +24,7 @@ #include "arch/instruction_set.h" #include "base/arena_allocator.h" +#include "base/bit_utils.h" #include "base/mutex.h" #include "base/timing_logger.h" #include "class_reference.h" @@ -41,7 +42,6 @@ #include "utils/dedupe_set.h" #include "utils/dex_cache_arrays_layout.h" #include "utils/swap_space.h" -#include "utils.h" namespace art { diff --git a/compiler/dwarf/debug_frame_opcode_writer.h b/compiler/dwarf/debug_frame_opcode_writer.h index 4112c84027..d8077d5da9 100644 --- a/compiler/dwarf/debug_frame_opcode_writer.h +++ b/compiler/dwarf/debug_frame_opcode_writer.h @@ -17,10 +17,10 @@ #ifndef ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ #define ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ +#include "base/bit_utils.h" #include "dwarf/dwarf_constants.h" #include "dwarf/register.h" #include "dwarf/writer.h" -#include "utils.h" namespace art { namespace dwarf { diff --git a/compiler/dwarf/dwarf_test.h b/compiler/dwarf/dwarf_test.h index 3afb5eae56..f819c49cee 100644 --- a/compiler/dwarf/dwarf_test.h +++ b/compiler/dwarf/dwarf_test.h @@ -25,7 +25,6 @@ #include <string> #include <sys/types.h> -#include "utils.h" #include "base/unix_file/fd_file.h" #include "common_runtime_test.h" #include "elf_builder.h" diff --git a/compiler/dwarf/writer.h b/compiler/dwarf/writer.h index 3b9c55866a..e703aeea2d 100644 --- a/compiler/dwarf/writer.h +++ b/compiler/dwarf/writer.h @@ -18,9 +18,9 @@ #define ART_COMPILER_DWARF_WRITER_H_ #include <vector> -#include "leb128.h" +#include "base/bit_utils.h" #include "base/logging.h" -#include "utils.h" +#include "leb128.h" namespace art { namespace dwarf { diff --git a/compiler/elf_builder.h b/compiler/elf_builder.h index 972bd08270..8a63a4882f 100644 --- a/compiler/elf_builder.h +++ b/compiler/elf_builder.h @@ -20,6 +20,7 @@ #include <vector> #include "arch/instruction_set.h" +#include "base/bit_utils.h" #include "base/unix_file/fd_file.h" #include "buffered_output_stream.h" #include "elf_utils.h" diff --git a/compiler/elf_writer_debug.cc b/compiler/elf_writer_debug.cc index f4df6c18d0..c68bbc0655 100644 --- a/compiler/elf_writer_debug.cc +++ b/compiler/elf_writer_debug.cc @@ -25,6 +25,7 @@ #include "dwarf/headers.h" #include "dwarf/register.h" #include "oat_writer.h" +#include "utils.h" namespace art { namespace dwarf { diff --git a/compiler/gc_map_builder.h b/compiler/gc_map_builder.h index 4c36ef733c..45e3fc5589 100644 --- a/compiler/gc_map_builder.h +++ b/compiler/gc_map_builder.h @@ -19,8 +19,8 @@ #include <vector> +#include "base/bit_utils.h" #include "gc_map.h" -#include "utils.h" namespace art { diff --git a/compiler/image_writer.h b/compiler/image_writer.h index c0cffa5b2e..5921732399 100644 --- a/compiler/image_writer.h +++ b/compiler/image_writer.h @@ -26,6 +26,7 @@ #include <string> #include <ostream> +#include "base/bit_utils.h" #include "base/macros.h" #include "driver/compiler_driver.h" #include "gc/space/space.h" @@ -35,7 +36,6 @@ #include "os.h" #include "safe_map.h" #include "gc/space/space.h" -#include "utils.h" namespace art { @@ -136,7 +136,7 @@ class ImageWriter FINAL { friend std::ostream& operator<<(std::ostream& stream, const Bin& bin); - static constexpr size_t kBinBits = MinimumBitsToStore(kBinMirrorCount - 1); + static constexpr size_t kBinBits = MinimumBitsToStore<uint32_t>(kBinMirrorCount - 1); // uint32 = typeof(lockword_) static constexpr size_t kBinShift = BitSizeOf<uint32_t>() - kBinBits; // 111000.....0 diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index 7c400ee82c..7ed70971a3 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -18,6 +18,7 @@ #include "arch/instruction_set.h" #include "arch/instruction_set_features.h" +#include "base/time_utils.h" #include "base/timing_logger.h" #include "compiler_callbacks.h" #include "dex/pass_manager.h" diff --git a/compiler/jni/quick/arm64/calling_convention_arm64.cc b/compiler/jni/quick/arm64/calling_convention_arm64.cc index 03dccb93b9..8e7fd2b95f 100644 --- a/compiler/jni/quick/arm64/calling_convention_arm64.cc +++ b/compiler/jni/quick/arm64/calling_convention_arm64.cc @@ -158,7 +158,8 @@ Arm64JniCallingConvention::Arm64JniCallingConvention(bool is_static, bool is_syn const char* shorty) : JniCallingConvention(is_static, is_synchronized, shorty, kFramePointerSize) { uint32_t core_spill_mask = CoreSpillMask(); - for (int x_reg = 0; x_reg < kNumberOfXRegisters; ++x_reg) { + DCHECK_EQ(XZR, kNumberOfXRegisters - 1); // Exclude XZR from the loop (avoid 1 << 32). + for (int x_reg = 0; x_reg < kNumberOfXRegisters - 1; ++x_reg) { if (((1 << x_reg) & core_spill_mask) != 0) { callee_save_regs_.push_back( Arm64ManagedRegister::FromXRegister(static_cast<XRegister>(x_reg))); diff --git a/compiler/jni/quick/calling_convention.cc b/compiler/jni/quick/calling_convention.cc index 436fc0cfd0..2e146c4527 100644 --- a/compiler/jni/quick/calling_convention.cc +++ b/compiler/jni/quick/calling_convention.cc @@ -23,7 +23,6 @@ #include "jni/quick/mips64/calling_convention_mips64.h" #include "jni/quick/x86/calling_convention_x86.h" #include "jni/quick/x86_64/calling_convention_x86_64.h" -#include "utils.h" namespace art { diff --git a/compiler/jni/quick/x86/calling_convention_x86.cc b/compiler/jni/quick/x86/calling_convention_x86.cc index 8a45f0c855..499dd7cf58 100644 --- a/compiler/jni/quick/x86/calling_convention_x86.cc +++ b/compiler/jni/quick/x86/calling_convention_x86.cc @@ -19,7 +19,6 @@ #include "base/logging.h" #include "handle_scope-inl.h" #include "utils/x86/managed_register_x86.h" -#include "utils.h" namespace art { namespace x86 { diff --git a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc index bbdf1fe7bb..7e92d12ce8 100644 --- a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc +++ b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc @@ -16,10 +16,10 @@ #include "calling_convention_x86_64.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "handle_scope-inl.h" #include "utils/x86_64/managed_register_x86_64.h" -#include "utils.h" namespace art { namespace x86_64 { diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 09ed9c700e..7d26a3c9ae 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -494,11 +494,6 @@ InstructionCodeGeneratorARM::InstructionCodeGeneratorARM(HGraph* graph, CodeGene assembler_(codegen->GetAssembler()), codegen_(codegen) {} -static uint32_t LeastSignificantBit(uint32_t mask) { - // ffs starts at 1. - return ffs(mask) - 1; -} - void CodeGeneratorARM::ComputeSpillMask() { core_spill_mask_ = allocated_registers_.GetCoreRegisters() & core_callee_save_mask_; // Save one extra register for baseline. Note that on thumb2, there is no easy @@ -2222,7 +2217,7 @@ void InstructionCodeGeneratorARM::DivRemByPowerOfTwo(HBinaryOperation* instructi Register dividend = locations->InAt(0).AsRegister<Register>(); Register temp = locations->GetTemp(0).AsRegister<Register>(); int32_t imm = second.GetConstant()->AsIntConstant()->GetValue(); - int32_t abs_imm = std::abs(imm); + uint32_t abs_imm = static_cast<uint32_t>(std::abs(imm)); DCHECK(IsPowerOfTwo(abs_imm)); int ctz_imm = CTZ(abs_imm); diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index b6d99abca0..ced60cd33f 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -1738,7 +1738,7 @@ void InstructionCodeGeneratorARM64::DivRemByPowerOfTwo(HBinaryOperation* instruc Register out = OutputRegister(instruction); Register dividend = InputRegisterAt(instruction, 0); int64_t imm = Int64FromConstant(second.GetConstant()); - int64_t abs_imm = std::abs(imm); + uint64_t abs_imm = static_cast<uint64_t>(std::abs(imm)); DCHECK(IsPowerOfTwo(abs_imm)); int ctz_imm = CTZ(abs_imm); diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc index 4e3436e32b..8ef13e125e 100644 --- a/compiler/optimizing/intrinsics.cc +++ b/compiler/optimizing/intrinsics.cc @@ -22,6 +22,7 @@ #include "invoke_type.h" #include "nodes.h" #include "quick/inline_method_analyser.h" +#include "utils.h" namespace art { diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 2ece5a559c..483c09e5a9 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -19,6 +19,7 @@ #include "code_generator.h" #include "ssa_builder.h" #include "base/bit_vector-inl.h" +#include "base/bit_utils.h" #include "utils/growable_array.h" #include "scoped_thread_state_change.h" diff --git a/compiler/optimizing/parallel_move_resolver.h b/compiler/optimizing/parallel_move_resolver.h index e89417df7d..9ede91013e 100644 --- a/compiler/optimizing/parallel_move_resolver.h +++ b/compiler/optimizing/parallel_move_resolver.h @@ -20,6 +20,7 @@ #include "base/value_object.h" #include "utils/growable_array.h" #include "locations.h" +#include "primitive.h" namespace art { diff --git a/compiler/optimizing/register_allocator.h b/compiler/optimizing/register_allocator.h index 6d5bfc3f0d..c29fe75921 100644 --- a/compiler/optimizing/register_allocator.h +++ b/compiler/optimizing/register_allocator.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_H_ #define ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_H_ +#include "arch/instruction_set.h" #include "base/macros.h" #include "primitive.h" #include "utils/growable_array.h" diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc index eca6f5a30c..0cd5c8b24b 100644 --- a/compiler/utils/arm/assembler_arm.cc +++ b/compiler/utils/arm/assembler_arm.cc @@ -16,11 +16,11 @@ #include "assembler_arm.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "entrypoints/quick/quick_entrypoints.h" #include "offsets.h" #include "thread.h" -#include "utils.h" namespace art { namespace arm { diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h index 52a69ca487..9179965a9d 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -19,13 +19,13 @@ #include <vector> +#include "base/bit_utils.h" #include "base/logging.h" #include "base/value_object.h" #include "constants_arm.h" #include "utils/arm/managed_register_arm.h" #include "utils/assembler.h" #include "offsets.h" -#include "utils.h" namespace art { namespace arm { diff --git a/compiler/utils/arm/assembler_arm32.cc b/compiler/utils/arm/assembler_arm32.cc index 6e165fc151..cdf62bf885 100644 --- a/compiler/utils/arm/assembler_arm32.cc +++ b/compiler/utils/arm/assembler_arm32.cc @@ -16,11 +16,11 @@ #include "assembler_arm32.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "entrypoints/quick/quick_entrypoints.h" #include "offsets.h" #include "thread.h" -#include "utils.h" namespace art { namespace arm { diff --git a/compiler/utils/arm/assembler_arm32.h b/compiler/utils/arm/assembler_arm32.h index 45647675e8..3164623fd9 100644 --- a/compiler/utils/arm/assembler_arm32.h +++ b/compiler/utils/arm/assembler_arm32.h @@ -24,7 +24,6 @@ #include "utils/arm/managed_register_arm.h" #include "utils/arm/assembler_arm.h" #include "offsets.h" -#include "utils.h" namespace art { namespace arm { diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc index 4ff3aeb45b..26cb6c3739 100644 --- a/compiler/utils/arm/assembler_thumb2.cc +++ b/compiler/utils/arm/assembler_thumb2.cc @@ -16,11 +16,11 @@ #include "assembler_thumb2.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "entrypoints/quick/quick_entrypoints.h" #include "offsets.h" #include "thread.h" -#include "utils.h" namespace art { namespace arm { diff --git a/compiler/utils/arm/assembler_thumb2.h b/compiler/utils/arm/assembler_thumb2.h index 9f02e56a74..2382b74c30 100644 --- a/compiler/utils/arm/assembler_thumb2.h +++ b/compiler/utils/arm/assembler_thumb2.h @@ -24,7 +24,6 @@ #include "utils/arm/managed_register_arm.h" #include "utils/arm/assembler_arm.h" #include "offsets.h" -#include "utils.h" namespace art { namespace arm { diff --git a/compiler/utils/arm64/assembler_arm64.cc b/compiler/utils/arm64/assembler_arm64.cc index f924c71dc1..9cc0c914a0 100644 --- a/compiler/utils/arm64/assembler_arm64.cc +++ b/compiler/utils/arm64/assembler_arm64.cc @@ -19,7 +19,6 @@ #include "entrypoints/quick/quick_entrypoints.h" #include "offsets.h" #include "thread.h" -#include "utils.h" using namespace vixl; // NOLINT(build/namespaces) diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h index e47b5314fd..b1b66ed49a 100644 --- a/compiler/utils/arm64/assembler_arm64.h +++ b/compiler/utils/arm64/assembler_arm64.h @@ -26,7 +26,6 @@ #include "utils/arm64/managed_register_arm64.h" #include "utils/assembler.h" #include "offsets.h" -#include "utils.h" // TODO: make vixl clean wrt -Wshadow. #pragma GCC diagnostic push diff --git a/compiler/utils/arm64/managed_register_arm64.h b/compiler/utils/arm64/managed_register_arm64.h index 62c1d4dbee..dbcd8c56f7 100644 --- a/compiler/utils/arm64/managed_register_arm64.h +++ b/compiler/utils/arm64/managed_register_arm64.h @@ -117,8 +117,7 @@ class Arm64ManagedRegister : public ManagedRegister { bool IsSRegister() const { CHECK(IsValidManagedRegister()); - const int test = id_ - (kNumberOfXRegIds + kNumberOfWRegIds + - kNumberOfDRegIds); + const int test = id_ - (kNumberOfXRegIds + kNumberOfWRegIds + kNumberOfDRegIds); return (0 <= test) && (test < kNumberOfSRegIds); } diff --git a/compiler/utils/assembler_test_base.h b/compiler/utils/assembler_test_base.h index 40eb15bbdc..c8b3fe58a8 100644 --- a/compiler/utils/assembler_test_base.h +++ b/compiler/utils/assembler_test_base.h @@ -17,14 +17,15 @@ #ifndef ART_COMPILER_UTILS_ASSEMBLER_TEST_BASE_H_ #define ART_COMPILER_UTILS_ASSEMBLER_TEST_BASE_H_ -#include "common_runtime_test.h" // For ScratchFile - #include <cstdio> #include <cstdlib> #include <fstream> #include <iterator> #include <sys/stat.h> +#include "common_runtime_test.h" // For ScratchFile +#include "utils.h" + namespace art { // If you want to take a look at the differences between the ART assembler and GCC, set this flag diff --git a/compiler/utils/dedupe_set.h b/compiler/utils/dedupe_set.h index a9a5781093..8cdb180740 100644 --- a/compiler/utils/dedupe_set.h +++ b/compiler/utils/dedupe_set.h @@ -26,6 +26,7 @@ #include "base/mutex.h" #include "base/stl_util.h" #include "base/stringprintf.h" +#include "base/time_utils.h" #include "utils/swap_space.h" namespace art { diff --git a/compiler/utils/dex_cache_arrays_layout-inl.h b/compiler/utils/dex_cache_arrays_layout-inl.h index 2c50c96305..a71eeceafb 100644 --- a/compiler/utils/dex_cache_arrays_layout-inl.h +++ b/compiler/utils/dex_cache_arrays_layout-inl.h @@ -19,11 +19,11 @@ #include "dex_cache_arrays_layout.h" +#include "base/bit_utils.h" #include "base/logging.h" #include "globals.h" #include "mirror/array-inl.h" #include "primitive.h" -#include "utils.h" namespace mirror { class ArtMethod; diff --git a/compiler/utils/mips/assembler_mips.cc b/compiler/utils/mips/assembler_mips.cc index 709a911f6a..e769489479 100644 --- a/compiler/utils/mips/assembler_mips.cc +++ b/compiler/utils/mips/assembler_mips.cc @@ -16,6 +16,7 @@ #include "assembler_mips.h" +#include "base/bit_utils.h" #include "base/casts.h" #include "entrypoints/quick/quick_entrypoints.h" #include "memory_region.h" diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h index d4acf03dc9..34713e1305 100644 --- a/compiler/utils/mips/assembler_mips.h +++ b/compiler/utils/mips/assembler_mips.h @@ -25,7 +25,6 @@ #include "managed_register_mips.h" #include "utils/assembler.h" #include "offsets.h" -#include "utils.h" namespace art { namespace mips { diff --git a/compiler/utils/mips64/assembler_mips64.cc b/compiler/utils/mips64/assembler_mips64.cc index 5e9653df33..b95e436897 100644 --- a/compiler/utils/mips64/assembler_mips64.cc +++ b/compiler/utils/mips64/assembler_mips64.cc @@ -16,6 +16,7 @@ #include "assembler_mips64.h" +#include "base/bit_utils.h" #include "base/casts.h" #include "entrypoints/quick/quick_entrypoints.h" #include "memory_region.h" @@ -116,7 +117,7 @@ void Mips64Assembler::EmitJump(Label* label, bool link) { int32_t Mips64Assembler::EncodeBranchOffset(int offset, int32_t inst, bool is_jump) { CHECK_ALIGNED(offset, 4); - CHECK(IsInt(POPCOUNT(kBranchOffsetMask), offset)) << offset; + CHECK(IsInt<POPCOUNT(kBranchOffsetMask)>(offset)) << offset; // Properly preserve only the bits supported in the instruction. offset >>= 2; diff --git a/compiler/utils/mips64/assembler_mips64.h b/compiler/utils/mips64/assembler_mips64.h index 2d7c661eac..95ba967646 100644 --- a/compiler/utils/mips64/assembler_mips64.h +++ b/compiler/utils/mips64/assembler_mips64.h @@ -25,7 +25,6 @@ #include "managed_register_mips64.h" #include "utils/assembler.h" #include "offsets.h" -#include "utils.h" namespace art { namespace mips64 { diff --git a/compiler/utils/swap_space.h b/compiler/utils/swap_space.h index 1f8f5da6cd..691df4a945 100644 --- a/compiler/utils/swap_space.h +++ b/compiler/utils/swap_space.h @@ -28,7 +28,6 @@ #include "base/macros.h" #include "base/mutex.h" #include "mem_map.h" -#include "utils.h" namespace art { diff --git a/compiler/utils/test_dex_file_builder.h b/compiler/utils/test_dex_file_builder.h index ab039aa215..b1d7b4ccf3 100644 --- a/compiler/utils/test_dex_file_builder.h +++ b/compiler/utils/test_dex_file_builder.h @@ -22,8 +22,9 @@ #include <map> #include <vector> +#include "base/bit_utils.h" +#include "base/logging.h" #include "dex_file.h" -#include "utils.h" namespace art { diff --git a/compiler/utils/test_dex_file_builder_test.cc b/compiler/utils/test_dex_file_builder_test.cc index ee6e35dcce..7a424a23f5 100644 --- a/compiler/utils/test_dex_file_builder_test.cc +++ b/compiler/utils/test_dex_file_builder_test.cc @@ -18,6 +18,7 @@ #include "dex_file-inl.h" #include "gtest/gtest.h" +#include "utils.h" namespace art { diff --git a/compiler/utils/x86/assembler_x86.h b/compiler/utils/x86/assembler_x86.h index 136b0cbfdb..5319dacab7 100644 --- a/compiler/utils/x86/assembler_x86.h +++ b/compiler/utils/x86/assembler_x86.h @@ -18,13 +18,13 @@ #define ART_COMPILER_UTILS_X86_ASSEMBLER_X86_H_ #include <vector> +#include "base/bit_utils.h" #include "base/macros.h" #include "constants_x86.h" #include "globals.h" #include "managed_register_x86.h" #include "offsets.h" #include "utils/assembler.h" -#include "utils.h" namespace art { namespace x86 { diff --git a/compiler/utils/x86_64/assembler_x86_64.h b/compiler/utils/x86_64/assembler_x86_64.h index 162714af68..7daf994900 100644 --- a/compiler/utils/x86_64/assembler_x86_64.h +++ b/compiler/utils/x86_64/assembler_x86_64.h @@ -18,13 +18,14 @@ #define ART_COMPILER_UTILS_X86_64_ASSEMBLER_X86_64_H_ #include <vector> + +#include "base/bit_utils.h" #include "base/macros.h" #include "constants_x86_64.h" #include "globals.h" #include "managed_register_x86_64.h" #include "offsets.h" #include "utils/assembler.h" -#include "utils.h" namespace art { namespace x86_64 { diff --git a/compiler/utils/x86_64/assembler_x86_64_test.cc b/compiler/utils/x86_64/assembler_x86_64_test.cc index 0be4d632fb..dcffe35113 100644 --- a/compiler/utils/x86_64/assembler_x86_64_test.cc +++ b/compiler/utils/x86_64/assembler_x86_64_test.cc @@ -20,9 +20,9 @@ #include <map> #include <random> +#include "base/bit_utils.h" #include "base/stl_util.h" #include "utils/assembler_test.h" -#include "utils.h" namespace art { |