Merge "[optimizing] Add if-context sensitivity for null popagation."

diff --cc compiler/optimizing/nodes.h
index de448cc,ba01c2b..7e07564
--- 1/compiler/optimizing/nodes.h
--- 2/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@@ -1052,13 -1018,13 +1055,16 @@@ class HInstruction : public ArenaObject
      reference_type_info_ = reference_type_info;
    }
  
-   ReferenceTypeInfo GetReferenceTypeInfo() const { return reference_type_info_; }
+   ReferenceTypeInfo GetReferenceTypeInfo() const {
+     DCHECK_EQ(GetType(), Primitive::kPrimNot);
+     return reference_type_info_;
+   }
  
    void AddUseAt(HInstruction* user, size_t index) {
 -    uses_.AddUse(user, index, GetBlock()->GetGraph()->GetArena());
 +    DCHECK(user != nullptr);
 +    HUseListNode<HInstruction*>* use =
 +        uses_.AddUse(user, index, GetBlock()->GetGraph()->GetArena());
 +    user->SetRawInputRecordAt(index, HUserRecord<HInstruction*>(user->InputRecordAt(index), use));
    }
  
    void AddEnvUseAt(HEnvironment* user, size_t index) {