diff options
| author | 2016-02-02 20:40:07 +0000 | |
|---|---|---|
| committer | 2016-02-02 20:40:07 +0000 | |
| commit | 24c11dcde9e8ed53813129b40f82a1af42b880b9 (patch) | |
| tree | 500b2f108092e5cb10e3519dcd2baa1d5e14a5fd | |
| parent | a89d6d630b6fdb591d3dce536f8bca35deae307e (diff) | |
| parent | 9f35ccd3880e2d4d03dce7d7edb4307fadddf62b (diff) | |
Merge "ART: Fix bad manual rename of local variable."
| -rw-r--r-- | runtime/quick/inline_method_analyser.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index 17306c9842..6b84c8faa2 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -108,7 +108,7 @@ bool InlineMethodAnalyser::AnalyseMethodCode(const DexFile::CodeItem* code_item, switch (opcode) { case Instruction::RETURN_VOID: - if (method != nullptr) { + if (result != nullptr) { result->opcode = kInlineOpNop; result->flags = kInlineSpecial; result->d.data = 0u; |