diff options
| -rw-r--r-- | compiler/dex/quick/dex_file_method_inliner.cc | 4 | ||||
| -rw-r--r-- | compiler/dex/quick/dex_file_method_inliner.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index 3c331e12d9..c21ddcc430 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -510,7 +510,9 @@ bool DexFileMethodInliner::AddInlineMethod(int32_t method_idx, InlineMethodOpcod WriterMutexLock mu(Thread::Current(), lock_); InlineMethod* im = &inline_methods_[method_idx]; if (im->flags == 0) { - *im = InlineMethod{opcode, flags, data}; + im->opcode = opcode; + im->flags = flags; + im->data = data; return true; } else { // TODO: Warning about a method being already inlined? diff --git a/compiler/dex/quick/dex_file_method_inliner.h b/compiler/dex/quick/dex_file_method_inliner.h index 06de4fef27..1d9973108b 100644 --- a/compiler/dex/quick/dex_file_method_inliner.h +++ b/compiler/dex/quick/dex_file_method_inliner.h @@ -373,8 +373,8 @@ class DexFileMethodInliner { bool AnalyseReturnMethod(int32_t method_idx, const DexFile::CodeItem* code_item, OpSize size) LOCKS_EXCLUDED(lock_); - bool AnalyseConstMethod(int32_t method_idx, const DexFile::CodeItem* code_item - ) LOCKS_EXCLUDED(lock_); + bool AnalyseConstMethod(int32_t method_idx, const DexFile::CodeItem* code_item) + LOCKS_EXCLUDED(lock_); bool AnalyseIGetMethod(int32_t method_idx, const DexFile::CodeItem* code_item, OpSize size, bool is_object) LOCKS_EXCLUDED(lock_); bool AnalyseIPutMethod(int32_t method_idx, const DexFile::CodeItem* code_item, |