Skip to content

Update wasmparser to version 0.89.1 #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update wasmparser to version 0.89.1 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ anyhow = "1.0"
fallible-iterator = { version = "0.2.0", optional = true }
gimli = { version = "0.26.2", optional = true, default-features = false, features = ["std", "read"] }
object = { version = "0.17.0", optional = true }
wasmparser = "0.73.0"
wasmparser = { version = "0.89.1" }
typed-arena = { version = "2.0.1", optional = true }
twiggy-ir = { version = "=0.7.0", path = "../ir" }
twiggy-traits = { version = "=0.7.0", path = "../traits" }
Expand Down
147 changes: 79 additions & 68 deletions parser/wasm_parse/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use anyhow::anyhow;
use std::collections::HashMap;
use twiggy_ir::{self as ir, Id};
use wasmparser::SectionWithLimitedItems;
use wasmparser::{self, Operator, SectionReader, Type};
use wasmparser::{self, Operator, SectionReader, ValType};

#[derive(Default)]
pub struct SectionIndices {
Expand Down Expand Up @@ -68,7 +68,7 @@ impl<'a> ModuleReader<'a> {
&self,
index: usize,
start_offset: usize,
byte_range: wasmparser::Range,
byte_range: std::ops::Range<usize>,
) -> anyhow::Result<CodeSection<'a>> {
Ok(CodeSection {
index: index,
Expand Down Expand Up @@ -151,17 +151,12 @@ impl<'a> Parse<'a> for ModuleReader<'a> {
let start = items.size_added();
let name = get_section_name(&section);
match section {
wasmparser::Payload::CustomSection {
name,
data,
data_offset,
} => {
wasmparser::Payload::CustomSection(reader) => {
CustomSectionReader {
name,
data,
data_offset,
}
.parse_items(items, idx)?;
name: reader.name(),
data: reader.data(),
data_offset: reader.data_offset(),
}.parse_items(items, idx)?;
}
wasmparser::Payload::TypeSection(mut reader) => {
reader.parse_items(items, idx)?;
Expand Down Expand Up @@ -207,10 +202,18 @@ impl<'a> Parse<'a> for ModuleReader<'a> {
wasmparser::Payload::Version { .. }
| wasmparser::Payload::CodeSectionEntry { .. }
| wasmparser::Payload::AliasSection { .. }
| wasmparser::Payload::EventSection { .. }
| wasmparser::Payload::ComponentAliasSection { .. }
| wasmparser::Payload::ComponentCanonicalSection { .. }
| wasmparser::Payload::ComponentExportSection { .. }
| wasmparser::Payload::ComponentImportSection { .. }
| wasmparser::Payload::ComponentInstanceSection { .. }
| wasmparser::Payload::ComponentSection { .. }
| wasmparser::Payload::ComponentStartSection { .. }
| wasmparser::Payload::ComponentTypeSection { .. }
| wasmparser::Payload::CoreTypeSection { .. }
| wasmparser::Payload::InstanceSection { .. }
| wasmparser::Payload::ModuleSectionStart { .. }
| wasmparser::Payload::ModuleSectionEntry { .. }
| wasmparser::Payload::ModuleSection { .. }
| wasmparser::Payload::TagSection { .. }
| wasmparser::Payload::UnknownSection { .. }
| wasmparser::Payload::End { .. } => {}
};
Expand Down Expand Up @@ -268,21 +271,19 @@ impl<'a> Parse<'a> for ModuleReader<'a> {
for (i, import) in reader.clone().into_iter().enumerate() {
let id = Id::entry(*idx, i);
match import?.ty {
wasmparser::ImportSectionEntryType::Function(_) => {
wasmparser::TypeRef::Func(_) => {
indices.functions.push(id);
}
wasmparser::ImportSectionEntryType::Table(_) => {
wasmparser::TypeRef::Table(_) => {
indices.tables.push(id);
}
wasmparser::ImportSectionEntryType::Memory(_) => {
wasmparser::TypeRef::Memory(_) => {
indices.memories.push(id);
}
wasmparser::ImportSectionEntryType::Global(_) => {
wasmparser::TypeRef::Global(_) => {
indices.globals.push(id);
}
wasmparser::ImportSectionEntryType::Event(_) => {}
wasmparser::ImportSectionEntryType::Module(_) => {}
wasmparser::ImportSectionEntryType::Instance(_) => {}
wasmparser::TypeRef::Tag(_) => {}
}
}
}
Expand Down Expand Up @@ -331,15 +332,11 @@ impl<'a> Parse<'a> for ModuleReader<'a> {
};
for IndexedSection(idx, section) in sections.into_iter() {
match section {
wasmparser::Payload::CustomSection {
name,
data,
data_offset,
} => {
wasmparser::Payload::CustomSection(reader) => {
CustomSectionReader {
name,
data,
data_offset,
name: reader.name(),
data: reader.data(),
data_offset: reader.data_offset(),
}
.parse_edges(items, ())?;
}
Expand Down Expand Up @@ -387,10 +384,18 @@ impl<'a> Parse<'a> for ModuleReader<'a> {
wasmparser::Payload::Version { .. }
| wasmparser::Payload::CodeSectionEntry { .. }
| wasmparser::Payload::AliasSection { .. }
| wasmparser::Payload::EventSection { .. }
| wasmparser::Payload::ModuleSection { .. }
| wasmparser::Payload::InstanceSection { .. }
| wasmparser::Payload::ModuleSectionStart { .. }
| wasmparser::Payload::ModuleSectionEntry { .. }
| wasmparser::Payload::TagSection { .. }
| wasmparser::Payload::CoreTypeSection { .. }
| wasmparser::Payload::ComponentSection { .. }
| wasmparser::Payload::ComponentAliasSection { .. }
| wasmparser::Payload::ComponentInstanceSection { .. }
| wasmparser::Payload::ComponentTypeSection { .. }
| wasmparser::Payload::ComponentCanonicalSection { .. }
| wasmparser::Payload::ComponentStartSection { .. }
| wasmparser::Payload::ComponentImportSection { .. }
| wasmparser::Payload::ComponentExportSection { .. }
| wasmparser::Payload::UnknownSection { .. }
| wasmparser::Payload::End { .. } => {}
}
Expand All @@ -406,8 +411,8 @@ fn get_code_section_name() -> String {

fn get_section_name(section: &wasmparser::Payload<'_>) -> String {
match section {
wasmparser::Payload::CustomSection { name, .. } => {
format!("custom section '{}' headers", name)
wasmparser::Payload::CustomSection ( reader ) => {
format!("custom section '{}' headers", reader.name())
}
wasmparser::Payload::TypeSection(_) => "type section headers".to_string(),
wasmparser::Payload::ImportSection(_) => "import section headers".to_string(),
Expand All @@ -427,10 +432,18 @@ fn get_section_name(section: &wasmparser::Payload<'_>) -> String {
panic!("unexpected CodeSectionEntry");
}
wasmparser::Payload::AliasSection { .. }
| wasmparser::Payload::EventSection { .. }
| wasmparser::Payload::ComponentAliasSection { .. }
| wasmparser::Payload::ComponentCanonicalSection { .. }
| wasmparser::Payload::ComponentInstanceSection { .. }
| wasmparser::Payload::ComponentExportSection { .. }
| wasmparser::Payload::ComponentImportSection { .. }
| wasmparser::Payload::ComponentSection { .. }
| wasmparser::Payload::ComponentStartSection { .. }
| wasmparser::Payload::ComponentTypeSection { .. }
| wasmparser::Payload::CoreTypeSection { .. }
| wasmparser::Payload::InstanceSection { .. }
| wasmparser::Payload::ModuleSectionStart { .. }
| wasmparser::Payload::ModuleSectionEntry { .. }
| wasmparser::Payload::ModuleSection { .. }
| wasmparser::Payload::TagSection { .. }
| wasmparser::Payload::UnknownSection { .. }
| wasmparser::Payload::End { .. } => format!("{:?}", section),
}
Expand All @@ -441,13 +454,9 @@ fn parse_names_section<'a>(
) -> anyhow::Result<HashMap<usize, &'a str>> {
let mut names = HashMap::new();
for IndexedSection(_, section) in indexed_sections.iter() {
if let wasmparser::Payload::CustomSection {
name: "name",
data,
data_offset,
} = section
if let wasmparser::Payload::CustomSection (section_reader) = section
{
for subsection in wasmparser::NameSectionReader::new(data, *data_offset)? {
for subsection in wasmparser::NameSectionReader::new(section_reader.data(), section_reader.data_offset())? {
// We use a rather old version of wasmparser. This is a workaround
// to skip new types of name subsections instead of aborting.
let subsection = if let Ok(subsection) = subsection {
Expand Down Expand Up @@ -475,7 +484,7 @@ fn count_imported_functions<'a>(indexed_sections: &[IndexedSection<'a>]) -> anyh
for IndexedSection(_, section) in indexed_sections.iter() {
if let wasmparser::Payload::ImportSection(reader) = section {
for import in reader.clone() {
if let wasmparser::ImportSectionEntryType::Function(_) = import?.ty {
if let wasmparser::TypeRef::Func(_) = import?.ty {
imported_functions += 1;
}
}
Expand Down Expand Up @@ -603,7 +612,7 @@ impl<'a> Parse<'a> for (FunctionSection<'a>, CodeSection<'a>) {
| Operator::F32Load { memarg }
| Operator::F64Load { memarg } => {
if let Some(Operator::I32Const { value }) = prev {
if let Some(data_id) = items.get_data(value as u32 + memarg.offset) {
if let Some(data_id) = items.get_data(value as u32 + memarg.offset as u32) {
edges.push((body_id, data_id));
}
}
Expand Down Expand Up @@ -640,6 +649,14 @@ impl<'a> Parse<'a> for wasmparser::NameSectionReader<'a> {
wasmparser::Name::Module(_) => "\"module name\" subsection",
wasmparser::Name::Function(_) => "\"function names\" subsection",
wasmparser::Name::Local(_) => "\"local names\" subsection",
wasmparser::Name::Label(_) => "\"label names\" subsection",
wasmparser::Name::Type(_) => "\"types names\" subsection",
wasmparser::Name::Table(_) => "\"table names\" subsection",
wasmparser::Name::Memory(_) => "\"memory names\" subsection",
wasmparser::Name::Global(_) => "\"global names\" subsection",
wasmparser::Name::Element(_) => "\"element names\" subsection",
wasmparser::Name::Data(_) => "\"data names\" subsection",
wasmparser::Name::Unknown { .. } => "unknown subsection",
};
let id = Id::entry(idx, i);
items.add_root(ir::Item::new(id, name, size, ir::DebugInfo::new()));
Expand Down Expand Up @@ -694,7 +711,7 @@ impl<'a> Parse<'a> for wasmparser::TypeSectionReader<'a> {
let id = Id::entry(idx, i);

match ty {
wasmparser::TypeDef::Func(func) => {
wasmparser::Type::Func(func) => {
let mut name = format!("type[{}]: (", i);
for (i, param) in func.params.iter().enumerate() {
if i != 0 {
Expand All @@ -721,8 +738,6 @@ impl<'a> Parse<'a> for wasmparser::TypeSectionReader<'a> {

items.add_item(ir::Item::new(id, name, size, ir::Misc::new()));
}
wasmparser::TypeDef::Module(_module) => {}
wasmparser::TypeDef::Instance(_instance) => {}
}
}
Ok(())
Expand All @@ -742,7 +757,7 @@ impl<'a> Parse<'a> for wasmparser::ImportSectionReader<'a> {
for (i, imp) in iterate_with_size(self).enumerate() {
let (imp, size) = imp?;
let id = Id::entry(idx, i);
let name = format!("import {}::{}", imp.module, imp.field.unwrap_or("unknown"));
let name = format!("import {}::{}", imp.module, imp.name);
items.add_item(ir::Item::new(id, name, size, ir::Misc::new()));
}
Ok(())
Expand Down Expand Up @@ -823,7 +838,7 @@ impl<'a> Parse<'a> for wasmparser::ExportSectionReader<'a> {
for (i, exp) in iterate_with_size(self).enumerate() {
let (exp, size) = exp?;
let id = Id::entry(idx, i);
let name = format!("export \"{}\"", exp.field);
let name = format!("export \"{}\"", exp.name);
items.add_root(ir::Item::new(id, name, size, ir::Misc::new()));
}
Ok(())
Expand All @@ -840,7 +855,7 @@ impl<'a> Parse<'a> for wasmparser::ExportSectionReader<'a> {
let (exp, _) = exp?;
let exp_id = Id::entry(idx, i);
match exp.kind {
wasmparser::ExternalKind::Function => {
wasmparser::ExternalKind::Func => {
items.add_edge(exp_id, indices.functions[exp.index as usize]);
}
wasmparser::ExternalKind::Table => {
Expand All @@ -852,10 +867,7 @@ impl<'a> Parse<'a> for wasmparser::ExportSectionReader<'a> {
wasmparser::ExternalKind::Global => {
items.add_edge(exp_id, indices.globals[exp.index as usize]);
}
wasmparser::ExternalKind::Event
| wasmparser::ExternalKind::Type
| wasmparser::ExternalKind::Module
| wasmparser::ExternalKind::Instance => {}
wasmparser::ExternalKind::Tag => {}
}
}

Expand Down Expand Up @@ -953,7 +965,7 @@ impl<'a> Parse<'a> for wasmparser::ElementSectionReader<'a> {
wasmparser::ElementItem::Func(func_idx) => {
items.add_edge(elem_id, indices.functions[func_idx as usize]);
}
wasmparser::ElementItem::Null(_ty) => {}
wasmparser::ElementItem::Expr(_ty) => {}
}
}
}
Expand All @@ -974,8 +986,8 @@ impl<'a> Parse<'a> for wasmparser::DataSectionReader<'a> {

// Get the constant address (if any) from the initialization
// expression.
if let wasmparser::DataKind::Active { init_expr, .. } = d.kind {
let mut iter = init_expr.get_operators_reader();
if let wasmparser::DataKind::Active { offset_expr, .. } = d.kind {
let mut iter = offset_expr.get_operators_reader();
let offset = match iter.read()? {
Operator::I32Const { value } => Some(i64::from(value)),
Operator::I64Const { value } => Some(value),
Expand Down Expand Up @@ -1013,15 +1025,14 @@ fn iterate_with_size<'a, S: SectionWithLimitedItems + SectionReader>(
})
}

fn ty2str(t: Type) -> &'static str {
fn ty2str(t: ValType) -> &'static str {
match t {
Type::I32 => "i32",
Type::I64 => "i64",
Type::F32 => "f32",
Type::F64 => "f64",
Type::V128 => "v128",
Type::FuncRef => "funcref",
Type::ExnRef | Type::ExternRef => "externref",
Type::Func | Type::EmptyBlockType => "?",
ValType::I32 => "i32",
ValType::I64 => "i64",
ValType::F32 => "f32",
ValType::F64 => "f64",
ValType::V128 => "v128",
ValType::FuncRef => "funcref",
ValType::ExternRef => "externref",
}
}