diff options
| author | Bryan Ferris <bferris@google.com> | 2019-03-08 10:29:11 -0800 |
|---|---|---|
| committer | Greg Wroblewski <musashi@google.com> | 2019-04-15 12:17:18 -0700 |
| commit | 3413d52df08252f3043d60391bbeba4a02f13678 (patch) | |
| tree | 961624cd73676eaa5889f36840c716cbe6e86f94 | |
| parent | 59054ef367688f0100a54e1044a5e78666794bfc (diff) | |
| download | v8-security-oc-release.tar.gz | |
Fix type confusion in libpacandroid-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37security-oc-release
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)
| -rw-r--r-- | src/crankshaft/hydrogen-alias-analysis.h | 2 |
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; |