diff options
| author | 2016-04-13 11:59:46 +0100 | |
|---|---|---|
| committer | 2016-04-13 17:50:16 +0100 | |
| commit | 93205e395f777c1dd81d3f164cf9a4aec4bde45f (patch) | |
| tree | 1d08efd9b7bca9fe23df9ae9489c5dd575d3c6df /compiler/driver/compiler_driver.cc | |
| parent | 6990775e323cd9164d6cc10955a047b9d9f15f32 (diff) | |
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
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 14 |
1 files changed, 9 insertions, 5 deletions
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<uint8_t>* CompilerDriver::CreateJniDlsymLookup() const { +std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateJniDlsymLookup() const { CREATE_TRAMPOLINE(JNI, kJniAbi, pDlsymLookup) } -const std::vector<uint8_t>* CompilerDriver::CreateQuickGenericJniTrampoline() const { +std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateQuickGenericJniTrampoline() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickGenericJniTrampoline) } -const std::vector<uint8_t>* CompilerDriver::CreateQuickImtConflictTrampoline() const { +std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateQuickImtConflictTrampoline() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickImtConflictTrampoline) } -const std::vector<uint8_t>* CompilerDriver::CreateQuickResolutionTrampoline() const { +std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateQuickResolutionTrampoline() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickResolutionTrampoline) } -const std::vector<uint8_t>* CompilerDriver::CreateQuickToInterpreterBridge() const { +std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateQuickToInterpreterBridge() + const { CREATE_TRAMPOLINE(QUICK, kQuickAbi, pQuickToInterpreterBridge) } #undef CREATE_TRAMPOLINE |