diff options
| author | 2017-05-24 00:14:37 +0000 | |
|---|---|---|
| committer | 2017-05-24 00:14:37 +0000 | |
| commit | 3b101e4bf11c5fa2d0f3d57d2fadccdc1dcdff93 (patch) | |
| tree | 4620b702ae7728245071f557bfe8f284d7be6150 /compiler | |
| parent | 81cbb240f86487e23409324a288f2155231e48f9 (diff) | |
| parent | f20729914d87ab30e6c96420720d8718affd587f (diff) | |
Merge "optimizing: Fix a potential nullptr dereference"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/instruction_builder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 40fafb0ae5..df9e7164ed 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -1000,8 +1000,8 @@ HNewInstance* HInstructionBuilder::BuildNewInstance(dex::TypeIndex type_index, u void HInstructionBuilder::BuildConstructorFenceForAllocation(HInstruction* allocation) { DCHECK(allocation != nullptr && - allocation->IsNewInstance() || - allocation->IsNewArray()); // corresponding to "new" keyword in JLS. + (allocation->IsNewInstance() || + allocation->IsNewArray())); // corresponding to "new" keyword in JLS. if (allocation->IsNewInstance()) { // STRING SPECIAL HANDLING: |