40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakob Kummerow <jkummerow@chromium.org>
|
||
|
|
Date: Thu, 11 Jul 2024 16:34:00 +0200
|
||
|
|
Subject: Fix cast of memory index
|
||
|
|
|
||
|
|
"uint8_t" must have been a typo.
|
||
|
|
|
||
|
|
Fixed: 351327767
|
||
|
|
Bug: 42203854
|
||
|
|
Change-Id: I196c961ec2f2ed16acfe16bf304d7eae6551aacc
|
||
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5695665
|
||
|
|
Reviewed-by: Matthias Liedtke <mliedtke@chromium.org>
|
||
|
|
Commit-Queue: Matthias Liedtke <mliedtke@chromium.org>
|
||
|
|
Auto-Submit: Jakob Kummerow <jkummerow@chromium.org>
|
||
|
|
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
|
||
|
|
Cr-Commit-Position: refs/heads/main@{#94981}
|
||
|
|
|
||
|
|
diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc
|
||
|
|
index 16f1f1470b782ce3584ba4bb6626501c9f9551b7..02364fdf5d3d17fa0f03fd48d21523a4bae3f21e 100644
|
||
|
|
--- a/src/compiler/wasm-compiler.cc
|
||
|
|
+++ b/src/compiler/wasm-compiler.cc
|
||
|
|
@@ -3395,7 +3395,7 @@ Node* WasmGraphBuilder::MemStart(uint32_t mem_index) {
|
||
|
|
DCHECK_NOT_NULL(instance_cache_);
|
||
|
|
V8_ASSUME(cached_memory_index_ == kNoCachedMemoryIndex ||
|
||
|
|
cached_memory_index_ >= 0);
|
||
|
|
- if (mem_index == static_cast<uint8_t>(cached_memory_index_)) {
|
||
|
|
+ if (mem_index == static_cast<uint32_t>(cached_memory_index_)) {
|
||
|
|
return instance_cache_->mem_start;
|
||
|
|
}
|
||
|
|
return LoadMemStart(mem_index);
|
||
|
|
@@ -3405,7 +3405,7 @@ Node* WasmGraphBuilder::MemSize(uint32_t mem_index) {
|
||
|
|
DCHECK_NOT_NULL(instance_cache_);
|
||
|
|
V8_ASSUME(cached_memory_index_ == kNoCachedMemoryIndex ||
|
||
|
|
cached_memory_index_ >= 0);
|
||
|
|
- if (mem_index == static_cast<uint8_t>(cached_memory_index_)) {
|
||
|
|
+ if (mem_index == static_cast<uint32_t>(cached_memory_index_)) {
|
||
|
|
return instance_cache_->mem_size;
|
||
|
|
}
|
||
|
|
|