diff options
Diffstat (limited to 'compiler/utils/assembler_test.h')
-rw-r--r-- | compiler/utils/assembler_test.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/utils/assembler_test.h b/compiler/utils/assembler_test.h index 2579ddb52e..084e9011ba 100644 --- a/compiler/utils/assembler_test.h +++ b/compiler/utils/assembler_test.h @@ -460,7 +460,8 @@ class AssemblerTest : public testing::Test { explicit AssemblerTest() {} void SetUp() OVERRIDE { - assembler_.reset(new Ass()); + arena_.reset(new ArenaAllocator(&pool_)); + assembler_.reset(new (arena_.get()) Ass(arena_.get())); test_helper_.reset( new AssemblerTestInfrastructure(GetArchitectureString(), GetAssemblerCmdName(), @@ -476,6 +477,8 @@ class AssemblerTest : public testing::Test { void TearDown() OVERRIDE { test_helper_.reset(); // Clean up the helper. + assembler_.reset(); + arena_.reset(); } // Override this to set up any architecture-specific things, e.g., register vectors. @@ -919,6 +922,8 @@ class AssemblerTest : public testing::Test { static constexpr size_t kWarnManyCombinationsThreshold = 500; + ArenaPool pool_; + std::unique_ptr<ArenaAllocator> arena_; std::unique_ptr<Ass> assembler_; std::unique_ptr<AssemblerTestInfrastructure> test_helper_; |