diff options
| author | 2016-06-29 12:33:23 +0000 | |
|---|---|---|
| committer | 2016-06-29 12:33:23 +0000 | |
| commit | fdbc39551e08fa6a17e1b4bf6904860ccc052aa2 (patch) | |
| tree | 0ade9d5225b067f4d0369e5369975c1e8d9f345f /compiler/optimizing | |
| parent | 34bccc1d85787658a5d04d2caa52b6eeca18710f (diff) | |
| parent | e8e1127da3f154fae8d2eb16a94203544a182159 (diff) | |
Merge "Do checks on the fault address when we think it's an NPE."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/nodes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 29df7c8ab8..6b2c33e668 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -5029,7 +5029,7 @@ class HInstanceFieldGet FINAL : public HExpression<1> { } bool CanDoImplicitNullCheckOn(HInstruction* obj) const OVERRIDE { - return (obj == InputAt(0)) && GetFieldOffset().Uint32Value() < kPageSize; + return (obj == InputAt(0)) && art::CanDoImplicitNullCheckOn(GetFieldOffset().Uint32Value()); } size_t ComputeHashCode() const OVERRIDE { @@ -5076,7 +5076,7 @@ class HInstanceFieldSet FINAL : public HTemplateInstruction<2> { } bool CanDoImplicitNullCheckOn(HInstruction* obj) const OVERRIDE { - return (obj == InputAt(0)) && GetFieldOffset().Uint32Value() < kPageSize; + return (obj == InputAt(0)) && art::CanDoImplicitNullCheckOn(GetFieldOffset().Uint32Value()); } const FieldInfo& GetFieldInfo() const { return field_info_; } |