diff options
author | 2020-05-08 00:08:42 +0000 | |
---|---|---|
committer | 2020-05-08 07:25:07 +0000 | |
commit | fc5e2ef08c78bcf4a60c5097ff3a7fa80e358522 (patch) | |
tree | 4c1d538f5faf72617e9088b8f99a368b999b32dd /compiler/optimizing | |
parent | 685c84775f7dfe23197b080e4730435fd80e6d27 (diff) |
Revert "Remove test_per_src from ART tests."
This reverts commit 8103e479d8f8447584582b2b70752029f7087776.
Reason for revert: asan run fails in multiple ways
Test: ran ./art/test/testrunner/run_build_test_target.py art-gtest-asan
Change-Id: Ib9f2887436a664b64c6410f56a25ae2dd0e0aab4
Diffstat (limited to 'compiler/optimizing')
-rw-r--r-- | compiler/optimizing/codegen_test_utils.h | 8 | ||||
-rw-r--r-- | compiler/optimizing/optimizing_unit_test.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h index 9d15f1f294..9fbd7d6fc0 100644 --- a/compiler/optimizing/codegen_test_utils.h +++ b/compiler/optimizing/codegen_test_utils.h @@ -313,25 +313,25 @@ static void RunCode(CodegenTargetConfig target_config, } #ifdef ART_ENABLE_CODEGEN_arm -inline CodeGenerator* create_codegen_arm_vixl32(HGraph* graph, const CompilerOptions& compiler_options) { +CodeGenerator* create_codegen_arm_vixl32(HGraph* graph, const CompilerOptions& compiler_options) { return new (graph->GetAllocator()) TestCodeGeneratorARMVIXL(graph, compiler_options); } #endif #ifdef ART_ENABLE_CODEGEN_arm64 -inline CodeGenerator* create_codegen_arm64(HGraph* graph, const CompilerOptions& compiler_options) { +CodeGenerator* create_codegen_arm64(HGraph* graph, const CompilerOptions& compiler_options) { return new (graph->GetAllocator()) TestCodeGeneratorARM64(graph, compiler_options); } #endif #ifdef ART_ENABLE_CODEGEN_x86 -inline CodeGenerator* create_codegen_x86(HGraph* graph, const CompilerOptions& compiler_options) { +CodeGenerator* create_codegen_x86(HGraph* graph, const CompilerOptions& compiler_options) { return new (graph->GetAllocator()) TestCodeGeneratorX86(graph, compiler_options); } #endif #ifdef ART_ENABLE_CODEGEN_x86_64 -inline CodeGenerator* create_codegen_x86_64(HGraph* graph, const CompilerOptions& compiler_options) { +CodeGenerator* create_codegen_x86_64(HGraph* graph, const CompilerOptions& compiler_options) { return new (graph->GetAllocator()) x86_64::CodeGeneratorX86_64(graph, compiler_options); } #endif diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index 670f91c8c9..eb262bc123 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -56,11 +56,11 @@ namespace art { #define FIVE_REGISTERS_CODE_ITEM(...) N_REGISTERS_CODE_ITEM(5, __VA_ARGS__) #define SIX_REGISTERS_CODE_ITEM(...) N_REGISTERS_CODE_ITEM(6, __VA_ARGS__) -inline LiveInterval* BuildInterval(const size_t ranges[][2], - size_t number_of_ranges, - ScopedArenaAllocator* allocator, - int reg = -1, - HInstruction* defined_by = nullptr) { +LiveInterval* BuildInterval(const size_t ranges[][2], + size_t number_of_ranges, + ScopedArenaAllocator* allocator, + int reg = -1, + HInstruction* defined_by = nullptr) { LiveInterval* interval = LiveInterval::MakeInterval(allocator, DataType::Type::kInt32, defined_by); if (defined_by != nullptr) { @@ -73,7 +73,7 @@ inline LiveInterval* BuildInterval(const size_t ranges[][2], return interval; } -inline void RemoveSuspendChecks(HGraph* graph) { +void RemoveSuspendChecks(HGraph* graph) { for (HBasicBlock* block : graph->GetBlocks()) { if (block != nullptr) { if (block->GetLoopInformation() != nullptr) { |