| commit | 254aa0d3f58b56b227077ef32b4606ebc25eaae4 | [log] [tgz] |
|---|---|---|
| author | Bill Buzbee <buzbee@android.com> | Wed Oct 08 17:20:22 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 08 17:20:23 2014 +0000 |
| tree | c8563c3790df02bfcf6442e50e3263f94a39abd1 | |
| parent | 1293b6b2adba33e8b5eca5632dd90c9835b2ef42 [diff] | |
| parent | 8ac41af13c8e48ede6a7c8a3bf2fb1a414326038 [diff] |
Merge "ART: Fix SelectKind to work with nullptr"
diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index dac71f6..20bc220 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc
@@ -186,6 +186,10 @@ } static SelectInstructionKind SelectKind(MIR* mir) { + // Work with the case when mir is nullptr. + if (mir == nullptr) { + return kSelectNone; + } switch (mir->dalvikInsn.opcode) { case Instruction::MOVE: case Instruction::MOVE_OBJECT: