Skip to content
This repository has been archived by the owner on Jan 29, 2025. It is now read-only.

spv-in: align array stride for undecorated arrays #1724

Merged
merged 1 commit into from
Feb 13, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/front/spv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4076,12 +4076,15 @@ impl<I: Iterator<Item = u32>> Parser<I> {

let decor = self.future_decor.remove(&id).unwrap_or_default();
let base = self.lookup_type.lookup(type_id)?.handle;
self.layouter
.update(&module.types, &module.constants)
.unwrap();
let inner = crate::TypeInner::Array {
base,
size: crate::ArraySize::Constant(length_const.handle),
stride: match decor.array_stride {
Some(stride) => stride.get(),
None => module.types[base].inner.size(&module.constants),
None => self.layouter[base].to_stride(),
},
};
self.lookup_type.insert(
Expand Down Expand Up @@ -4113,12 +4116,15 @@ impl<I: Iterator<Item = u32>> Parser<I> {

let decor = self.future_decor.remove(&id).unwrap_or_default();
let base = self.lookup_type.lookup(type_id)?.handle;
self.layouter
.update(&module.types, &module.constants)
.unwrap();
let inner = crate::TypeInner::Array {
base: self.lookup_type.lookup(type_id)?.handle,
size: crate::ArraySize::Dynamic,
stride: match decor.array_stride {
Some(stride) => stride.get(),
None => module.types[base].inner.size(&module.constants),
None => self.layouter[base].to_stride(),
},
};
self.lookup_type.insert(
Expand Down