diff options
| author | 2015-02-19 14:01:59 +0000 | |
|---|---|---|
| committer | 2015-02-19 14:01:59 +0000 | |
| commit | 39109a06015c91188232e59fa9e60e0915d24cd7 (patch) | |
| tree | a8ffd5fd966512fd280bc1b3214f4e57a9e1805f /compiler/optimizing/code_generator.cc | |
| parent | 92095533ac28879ddd8b44b559d700527ca12b8a (diff) | |
| parent | d6138ef1ea13d07ae555542f8898b30d89e9ac9a (diff) | |
Merge "Ensure the graph is correctly typed."
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index bf3ed14b48..5b395c8eeb 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -636,6 +636,8 @@ void CodeGenerator::RecordPcInfo(HInstruction* instruction, uint32_t dex_pc) { } else if (current->IsIntConstant()) { int32_t value = current->AsIntConstant()->GetValue(); stack_map_stream_.AddDexRegisterEntry(DexRegisterMap::kConstant, value); + } else if (current->IsNullConstant()) { + stack_map_stream_.AddDexRegisterEntry(DexRegisterMap::kConstant, 0); } else { DCHECK(current->IsFloatConstant()); int32_t value = bit_cast<float, int32_t>(current->AsFloatConstant()->GetValue()); |