diff options
author | 2015-01-21 17:36:33 +0000 | |
---|---|---|
committer | 2015-01-21 17:36:33 +0000 | |
commit | 9dec5a74014e96d41f84373990b4d4ac83206a88 (patch) | |
tree | 3aacf08f959a3d2558b9dc5985b6a3069506f4c8 /compiler/optimizing/code_generator.cc | |
parent | b6b114c02b8bacd3b5d64e646fdaefa03c069c61 (diff) | |
parent | 0ada95d8de4b04b5f201b4b7e9c3c2fd2cc321ae (diff) |
Merge "ART: Replace NULL to nullptr in the optimizing compiler"
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
-rw-r--r-- | compiler/optimizing/code_generator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 9665b0e2ae..bc9649fe3b 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -375,7 +375,7 @@ void CodeGenerator::BuildNativeGCMap( uint32_t native_offset = pc_info.native_pc; uint32_t dex_pc = pc_info.dex_pc; const uint8_t* references = dex_gc_map.FindBitMap(dex_pc, false); - CHECK(references != NULL) << "Missing ref for dex pc 0x" << std::hex << dex_pc; + CHECK(references != nullptr) << "Missing ref for dex pc 0x" << std::hex << dex_pc; builder.AddEntry(native_offset, references); } } |