Commit 5f6b7803 authored by Alessandro Pignotti's avatar Alessandro Pignotti Committed by Commit Bot

OwnedByAddressingOperand should also allow uses by ProtectedLoad

ProtectedLoad/ProtectedStore opcodes are used in WebAssembly to represent memory
accesses. Since they are not part of the allowed opcodes in OwnedByAddressingOperand
it is not possible to take advantage of addressing modes to encode common patterns
for the pointer input value.

R=jarin@chromium.org

Bug: v8:8508
Change-Id: Ic62bf13fed7b1d86afb112d9aa59cd7073a28e72
Reviewed-on: https://chromium-review.googlesource.com/c/1354458
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Reviewed-by: 's avatarAndreas Haas <ahaas@chromium.org>
Reviewed-by: 's avatarJaroslav Sevcik <jarin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58237}
parent 3dbb3749
...@@ -39,6 +39,7 @@ Cloudflare, Inc. <*@cloudflare.com> ...@@ -39,6 +39,7 @@ Cloudflare, Inc. <*@cloudflare.com>
Aaron Bieber <deftly@gmail.com> Aaron Bieber <deftly@gmail.com>
Abdulla Kamar <abdulla.kamar@gmail.com> Abdulla Kamar <abdulla.kamar@gmail.com>
Akinori MUSHA <knu@FreeBSD.org> Akinori MUSHA <knu@FreeBSD.org>
Alessandro Pignotti <alessandro@leaningtech.com>
Alex Kodat <akodat@rocketsoftware.com> Alex Kodat <akodat@rocketsoftware.com>
Alexander Botero-Lowry <alexbl@FreeBSD.org> Alexander Botero-Lowry <alexbl@FreeBSD.org>
Alexander Karpinsky <homm86@gmail.com> Alexander Karpinsky <homm86@gmail.com>
......
...@@ -678,11 +678,13 @@ struct BaseWithIndexAndDisplacementMatcher { ...@@ -678,11 +678,13 @@ struct BaseWithIndexAndDisplacementMatcher {
switch (from->opcode()) { switch (from->opcode()) {
case IrOpcode::kLoad: case IrOpcode::kLoad:
case IrOpcode::kPoisonedLoad: case IrOpcode::kPoisonedLoad:
case IrOpcode::kProtectedLoad:
case IrOpcode::kInt32Add: case IrOpcode::kInt32Add:
case IrOpcode::kInt64Add: case IrOpcode::kInt64Add:
// Skip addressing uses. // Skip addressing uses.
break; break;
case IrOpcode::kStore: case IrOpcode::kStore:
case IrOpcode::kProtectedStore:
// If the stored value is this node, it is not an addressing use. // If the stored value is this node, it is not an addressing use.
if (from->InputAt(2) == node) return false; if (from->InputAt(2) == node) return false;
// Otherwise it is used as an address and skipped. // Otherwise it is used as an address and skipped.
......
// Copyright 2018 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Flags: --allow-natives-syntax
load("test/mjsunit/wasm/wasm-constants.js");
load("test/mjsunit/wasm/wasm-module-builder.js");
const builder = new WasmModuleBuilder();
builder.addMemory(1, undefined, false);
builder.addFunction('load', kSig_i_i)
.addBody([
kExprGetLocal, 0,
kExprI32LoadMem, 0, 100])
.exportFunc();
const module = builder.instantiate();
%WasmTierUpFunction(module, 0);
// 100 is added as part of the load instruction above
// Last valid address (64k - 100 - 4)
assertEquals(0, module.exports.load(0x10000 - 100 - 4));
// First invalid address (64k - 100)
assertTraps(kTrapMemOutOfBounds, _ => { module.exports.load(0x10000 - 100);});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment