diff options
| author | 2015-10-08 13:59:41 +0000 | |
|---|---|---|
| committer | 2015-10-08 13:59:41 +0000 | |
| commit | 64d8d93aa9359b1126513dba92e27dbe184bfe3a (patch) | |
| tree | 6a09fca60e8c3bd72687eeb791789a5267885808 /compiler/optimizing/nodes.h | |
| parent | d40ef4b12b581c29753735ebd9815b19c16e3901 (diff) | |
| parent | 386062d13ce20d036555a9e24b73a67b4156b5cb (diff) | |
Merge "Make sure classes with different access checks are not GVN-ed"
Diffstat (limited to 'compiler/optimizing/nodes.h')
| -rw-r--r-- | compiler/optimizing/nodes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 95dd03970d..f009c410f4 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -4534,7 +4534,8 @@ class HLoadClass : public HExpression<1> { bool CanBeMoved() const OVERRIDE { return true; } bool InstructionDataEquals(HInstruction* other) const OVERRIDE { - return other->AsLoadClass()->type_index_ == type_index_; + return other->AsLoadClass()->type_index_ == type_index_ && + other->AsLoadClass()->needs_access_check_ == needs_access_check_; } size_t ComputeHashCode() const OVERRIDE { return type_index_; } |