| commit | 90feea47c8ad51fa246b0370dc0acb9eb57ddbfd | [log] [tgz] |
|---|---|---|
| author | Bryan Ferris <bferris@google.com> | Fri Mar 08 10:29:11 2019 -0800 |
| committer | Greg Wroblewski <musashi@google.com> | Mon Apr 15 12:17:48 2019 -0700 |
| tree | 0497d712d1d0d240126695d3f0b925edcf2b9eb1 | |
| parent | c985a0cd6004d4677f3845414e944fec01152b86 [diff] |
Fix type confusion in libpac From the upstream patch (https://chromium.googlesource.com/v8/v8/+/e33fd30777f99a0d6e16b16d096a2663b1031457%5E%21/#F0): """ Fix HAliasAnalyzer for constants """ Bug: 117606285 Test: /data/local/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Test: gts-tradefed run gts --test \ com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest \ --module GtsGmscoreHostTestCases Test: PoC from bug report Merged-In: I2e02d994f107e64e4f465b4d8a02d4159a95240e Change-Id: I297f27c69e94666c9f61efb216244b3d534cd018 (cherry picked from commit cad793346e55ab582a4aa43a246bb3cb10b76109)
diff --git a/src/crankshaft/hydrogen-alias-analysis.h b/src/crankshaft/hydrogen-alias-analysis.h index 1f32b7ac..d06aabc 100644 --- a/src/crankshaft/hydrogen-alias-analysis.h +++ b/src/crankshaft/hydrogen-alias-analysis.h
@@ -43,7 +43,7 @@ } // Constant objects can be distinguished statically. - if (a->IsConstant()) { + if (a->IsConstant() && b->IsConstant()) { return a->Equals(b) ? kMustAlias : kNoAlias; } return kMayAlias;