aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-04-16 22:41:59 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-04-16 22:41:59 +0000
commit587b96882112c6c3c93e8000b42551faa5ef4f66 (patch)
tree0497d712d1d0d240126695d3f0b925edcf2b9eb1
parent5afe728e4b3cd184f9fb99f58c853e9e8c1ef692 (diff)
parent35037d7e641a986cd43f2572bf3d8dca3cdae35c (diff)
downloadv8-pie-qpr3-s1-release.tar.gz
Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, 7077580, 7077581, 7077582, 7074025, 7077706, 7077707, 7077708, 7077388, 7077583, 7077584, 7077585, 7077726, 7077727, 7077331, 7077332, 7077459, 7077709, 7077710, 7077711, 7077712, 7077460, 7077461, 7077333, 7077334, 7077696] into pi-qpr3-releaseandroid-9.0.0_r46android-9.0.0_r44android-9.0.0_r43android-9.0.0_r41android-9.0.0_r40pie-qpr3-s1-releasepie-qpr3-release
Change-Id: Iafee2fe83647c9a2c4dc04a7de57895ad7384a6f
-rw-r--r--src/crankshaft/hydrogen-alias-analysis.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crankshaft/hydrogen-alias-analysis.h b/src/crankshaft/hydrogen-alias-analysis.h
index 1f32b7ac..d06aabc7 100644
--- a/src/crankshaft/hydrogen-alias-analysis.h
+++ b/src/crankshaft/hydrogen-alias-analysis.h
@@ -43,7 +43,7 @@ class HAliasAnalyzer : public ZoneObject {
}
// Constant objects can be distinguished statically.
- if (a->IsConstant()) {
+ if (a->IsConstant() && b->IsConstant()) {
return a->Equals(b) ? kMustAlias : kNoAlias;
}
return kMayAlias;