diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:44 +0200 |
| commit | 4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78 (patch) | |
| tree | 9dc9c3ba8ab461f7ee3d444222246be5ed55ae3f /chromium/v8/src/compiler/js-inlining.cc | |
| parent | 19de26b7efd6b993f2af26cf435f04c716d3f5bc (diff) | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
| download | qtwebengine-chromium-4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78.tar.gz | |
Merge branch 'upstream-master' into 58-based
Change-Id: I8c280ca9068fdda9cf6276725bfb8608eccb497a
Diffstat (limited to 'chromium/v8/src/compiler/js-inlining.cc')
| -rw-r--r-- | chromium/v8/src/compiler/js-inlining.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/v8/src/compiler/js-inlining.cc b/chromium/v8/src/compiler/js-inlining.cc index 206cd639fca..c87be6c2362 100644 --- a/chromium/v8/src/compiler/js-inlining.cc +++ b/chromium/v8/src/compiler/js-inlining.cc @@ -309,8 +309,12 @@ bool NeedsConvertReceiver(Node* receiver, Node* effect) { return false; } default: { + // We don't really care about the exact maps here, just the instance + // types, which don't change across potential side-effecting operations. ZoneHandleSet<Map> maps; - if (NodeProperties::InferReceiverMaps(receiver, effect, &maps)) { + NodeProperties::InferReceiverMapsResult result = + NodeProperties::InferReceiverMaps(receiver, effect, &maps); + if (result != NodeProperties::kNoReceiverMaps) { // Check if all {maps} are actually JSReceiver maps. for (size_t i = 0; i < maps.size(); ++i) { if (!maps[i]->IsJSReceiverMap()) return true; |