diff options
| author | Heejin Ahn <aheejin@gmail.com> | 2021-10-01 19:07:41 -0700 |
|---|---|---|
| committer | Heejin Ahn <aheejin@gmail.com> | 2021-10-05 17:11:22 -0700 |
| commit | 3ec1760d91a38e30d9535c313e4231e332910dd3 (patch) | |
| tree | 9b060fbb8da43ced700af5b9332543822c395761 /llvm/test/ObjectYAML | |
| parent | d51f57c23ca95f4b9b383f0942fee2957d36fd4f (diff) | |
| download | llvm-3ec1760d91a38e30d9535c313e4231e332910dd3.zip llvm-3ec1760d91a38e30d9535c313e4231e332910dd3.tar.gz llvm-3ec1760d91a38e30d9535c313e4231e332910dd3.tar.bz2 | |
[WebAssembly] Remove WasmTagType
This removes `WasmTagType`. `WasmTagType` contained an attribute and a
signature index:
```
struct WasmTagType {
uint8_t Attribute;
uint32_t SigIndex;
};
```
Currently the attribute field is not used and reserved for future use,
and always 0. And that this class contains `SigIndex` as its property is
a little weird in the place, because the tag type's signature index is
not an inherent property of a tag but rather a reference to another
section that changes after linking. This makes tag handling in the
linker also weird that tag-related methods are taking both `WasmTagType`
and `WasmSignature` even though `WasmTagType` contains a signature
index. This is because the signature index changes in linking so it
doesn't have any info at this point. This instead moves `SigIndex` to
`struct WasmTag` itself, as we did for `struct WasmFunction` in D111104.
In this CL, in lib/MC and lib/Object, this now treats tag types in the
same way as function types. Also in YAML, this removes `struct Tag`,
because now it only contains the tag index. Also tags set `SigIndex` in
`WasmImport` union, as functions do.
I think this makes things simpler and makes tag handling more in line
with function handling. These two shares similar properties in that both
of them have signatures, but they are kind of nominal so having the same
signature doesn't mean they are the same element.
Also a drive-by fix: the reserved 'attirubute' part's encoding changed
from uleb32 to uint8 a while ago. This was fixed in lib/MC and
lib/Object but not in YAML. This doesn't change object files because the
field's value is always 0 and its encoding is the same for the both
encoding.
This is effectively NFC; I didn't mark it as such just because it
changed YAML test results.
Reviewed By: sbc100, tlively
Differential Revision: https://reviews.llvm.org/D111086
Diffstat (limited to 'llvm/test/ObjectYAML')
| -rw-r--r-- | llvm/test/ObjectYAML/wasm/event_section.yaml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/llvm/test/ObjectYAML/wasm/event_section.yaml b/llvm/test/ObjectYAML/wasm/event_section.yaml index 2eeaa73..55e28d1 100644 --- a/llvm/test/ObjectYAML/wasm/event_section.yaml +++ b/llvm/test/ObjectYAML/wasm/event_section.yaml @@ -18,10 +18,7 @@ Sections: - Type: FUNCTION FunctionTypes: [ 0 ] - Type: TAG - Tags: - - Index: 0 - Attribute: 0 - SigIndex: 1 + TagTypes: [ 1 ] - Type: CODE Relocations: - Type: R_WASM_TAG_INDEX_LEB @@ -68,10 +65,7 @@ Sections: # CHECK-NEXT: - Type: FUNCTION # CHECK-NEXT: FunctionTypes: [ 0 ] # CHECK-NEXT: - Type: TAG -# CHECK-NEXT: Tags: -# CHECK-NEXT: - Index: 0 -# CHECK-NEXT: Attribute: 0 -# CHECK-NEXT: SigIndex: 1 +# CHECK-NEXT: TagTypes: [ 1 ] # CHECK-NEXT: - Type: CODE # CHECK-NEXT: Relocations: # CHECK-NEXT: - Type: R_WASM_TAG_INDEX_LEB |