From: Calin Juravle <calin@google.com>
Date: Tue, 24 Feb 2015 12:39:53 +0000 (+0000)
Subject: Merge "[optimizing] Add if-context sensitivity for null popagation."
X-Git-Tag: android-x86-7.1-r1~889^2~1966
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2d043b35;p=android-x86%2Fart.git

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

2d043b356d2e5c911892badf78aa56b843c5c3a6
diff --cc compiler/optimizing/nodes.h
index de448cc48,ba01c2b22..7e075644e
--- a/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) {