From 93205e395f777c1dd81d3f164cf9a4aec4bde45f Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 13 Apr 2016 11:59:46 +0100 Subject: Move Assemblers to the Arena. And clean up some APIs to return std::unique_ptr<> instead of raw pointers that don't communicate ownership. Change-Id: I3017302307a0253d661240750298802fb0d9585e --- compiler/driver/compiler_driver.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 52940687de..8bdff21c70 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -416,23 +416,27 @@ CompilerDriver::~CompilerDriver() { type ## _ENTRYPOINT_OFFSET(4, offset)); \ } -const std::vector* CompilerDriver::CreateJniDlsymLookup() const { +std::unique_ptr> CompilerDriver::CreateJniDlsymLookup() const { CREATE_TRAMPOLINE(JNI, kJniAbi, pDlsymLookup) } -const std::vector* CompilerDriver::CreateQuickGenericJniTrampoline() const { +std::unique_ptr> CompilerDriver::CreateQuickGenericJniTrampoline() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickGenericJniTrampoline) } -const std::vector* CompilerDriver::CreateQuickImtConflictTrampoline() const { +std::unique_ptr> CompilerDriver::CreateQuickImtConflictTrampoline() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickImtConflictTrampoline) } -const std::vector* CompilerDriver::CreateQuickResolutionTrampoline() const { +std::unique_ptr> CompilerDriver::CreateQuickResolutionTrampoline() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickResolutionTrampoline) } -const std::vector* CompilerDriver::CreateQuickToInterpreterBridge() const { +std::unique_ptr> CompilerDriver::CreateQuickToInterpreterBridge() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickToInterpreterBridge) } #undef CREATE_TRAMPOLINE -- cgit v1.2.3-59-g8ed1b