diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-11-27 17:56:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 09:56:49 -0800 |
| commit | bf44aa4777add07462df6fe7a02eac8754b40a82 (patch) | |
| tree | dd55b879ceffade8230012fc8ecaca78f604976f | |
| parent | c2ce34ef5a2bd0466bbc1d489193d98401bea0bf (diff) | |
| download | wabt-bf44aa4777add07462df6fe7a02eac8754b40a82.tar.gz wabt-bf44aa4777add07462df6fe7a02eac8754b40a82.tar.bz2 wabt-bf44aa4777add07462df6fe7a02eac8754b40a82.zip | |
Update ID for tag name subsection (#2336)
The tag name subsection currently has the speculative ID of 10.
However, the extended-name-section proposal has now been updated to
use an ID of 11 for the tag name section. This updates the
NameSectionSubsection enum accordingly, as well as adding a field
name section with the ID of 10.
| -rw-r--r-- | include/wabt/binary.h | 8 | ||||
| -rw-r--r-- | src/binary-reader-ir.cc | 1 | ||||
| -rw-r--r-- | src/binary.cc | 1 | ||||
| -rw-r--r-- | test/dump/extended-names.txt | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/include/wabt/binary.h b/include/wabt/binary.h index 485f15cb..ecf11a79 100644 --- a/include/wabt/binary.h +++ b/include/wabt/binary.h @@ -89,12 +89,8 @@ enum class NameSectionSubsection { Global = 7, ElemSegment = 8, DataSegment = 9, - // tag names are yet part of the extended-name-section proposal (because it - // only deals with naming things that are in the spec already). However, we - // include names for Tags in wabt using this enum value on the basis that tags - // can only exist when exceptions are enabled and that engines should ignore - // unknown name types. - Tag = 10, + Field = 10, + Tag = 11, First = Module, Last = Tag, diff --git a/src/binary-reader-ir.cc b/src/binary-reader-ir.cc index 82500b93..07546996 100644 --- a/src/binary-reader-ir.cc +++ b/src/binary-reader-ir.cc @@ -1588,6 +1588,7 @@ Result BinaryReaderIR::OnNameEntry(NameSectionSubsection type, case NameSectionSubsection::Local: case NameSectionSubsection::Module: case NameSectionSubsection::Label: + case NameSectionSubsection::Field: break; case NameSectionSubsection::Type: SetTypeName(index, name); diff --git a/src/binary.cc b/src/binary.cc index d4938a19..c8b96461 100644 --- a/src/binary.cc +++ b/src/binary.cc @@ -54,6 +54,7 @@ const char* NameSubsectionName[] = { "global", "elemseg", "dataseg", + "field", "tag", }; // clang-format on diff --git a/test/dump/extended-names.txt b/test/dump/extended-names.txt index b90a3308..e79093d5 100644 --- a/test/dump/extended-names.txt +++ b/test/dump/extended-names.txt @@ -338,7 +338,7 @@ 0000128: 05 ; string length 0000129: 6461 7461 31 data1 ; elem name 0 0000125: 08 ; FIXUP subsection size -000012e: 0a ; name subsection type +000012e: 0b ; name subsection type 000012f: 00 ; subsection size (guess) 0000130: 02 ; num names 0000131: 00 ; elem index |