This is an archive of the discontinued LLVM Phabricator instance.

Differential D44023

[WebAssembly] Fix tests with invalid yaml (required CODE section missing)
ClosedPublic

Authored by ncw on Mar 2 2018, 9:06 AM.

Details

Reviewers
sbc100
Commits
rG6705c00f4d1d: [WebAssembly] Fix tests with invalid yaml (required CODE section missing)
rL326692: [WebAssembly] Fix tests with invalid yaml (required CODE section missing)
Summary

No code change.

Split out of D43940 as requested - fixing tests is independent of the validation

Diff Detail

Event Timeline

ncw created this revision.Mar 2 2018, 9:06 AM
Herald added subscribers: llvm-commits, sunfish, aheejin and 3 others. · View Herald TranscriptMar 2 2018, 9:06 AM
Harbormaster completed remote builds in B15625: Diff 136769.Mar 2 2018, 9:06 AM
sbc100 accepted this revision.Mar 2 2018, 9:43 AM
sbc100 added inline comments.
test/ObjectYAML/wasm/function_section.yaml
32

I just noticed these expectations are a little funny. The last line doesnt' seem to be doing anything.

And I think the second to last line should be CHECK-NEXT:.

Anyway, not related to this fix I guess.

This revision is now accepted and ready to land.Mar 2 2018, 9:43 AM
Closed by commit rL326692: [WebAssembly] Fix tests with invalid yaml (required CODE section missing) (authored by ncw). · Explain WhyMar 5 2018, 4:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
ObjectYAML/
wasm/
8 lines
8 lines
15 lines

Diff 136769

test/ObjectYAML/wasm/export_section.yaml

Show All 32 Lines Exports:
Kind: GLOBAL Kind: GLOBAL
Index: 1 Index: 1
- Name: memory_export - Name: memory_export
Kind: MEMORY Kind: MEMORY
Index: 0 Index: 0
- Name: table_export - Name: table_export
Kind: TABLE Kind: TABLE
Index: 0 Index: 0
- Type: CODE
Functions:
- Index: 0
Locals:
Body: 0B
- Index: 1
Locals:
Body: 0B
... ...
# CHECK: --- !WASM # CHECK: --- !WASM
# CHECK: FileHeader: # CHECK: FileHeader:
# CHECK: Version: 0x00000001 # CHECK: Version: 0x00000001
# CHECK: Sections: # CHECK: Sections:
# CHECK: - Type: EXPORT # CHECK: - Type: EXPORT
# CHECK: Exports: # CHECK: Exports:
# CHECK: - Name: function_export # CHECK: - Name: function_export
Show All 12 Lines

test/ObjectYAML/wasm/function_section.yaml

# RUN: yaml2obj %s | obj2yaml | FileCheck %s # RUN: yaml2obj %s | obj2yaml | FileCheck %s
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: TYPE - Type: TYPE
Signatures: Signatures:
- Index: 0 - Index: 0
ReturnType: NORESULT ReturnType: NORESULT
ParamTypes: ParamTypes:
- Index: 1 - Index: 1
ReturnType: NORESULT ReturnType: NORESULT
ParamTypes: ParamTypes:
- I32 - I32
- Type: FUNCTION - Type: FUNCTION
FunctionTypes: [ 1, 0 ] FunctionTypes: [ 1, 0 ]
- Type: CODE
Functions:
- Index: 0
Locals:
Body: 0B
- Index: 1
Locals:
Body: 0B
... ...
# CHECK: --- !WASM # CHECK: --- !WASM
# CHECK: FileHeader: # CHECK: FileHeader:
# CHECK: Version: 0x00000001 # CHECK: Version: 0x00000001
# CHECK: Sections: # CHECK: Sections:
# CHECK: - Type: FUNCTION # CHECK: - Type: FUNCTION
# CHECK: FunctionTypes: [ 1, 0 ] # CHECK: FunctionTypes: [ 1, 0 ]
# CHECK: ... # CHECK: ...
sbc100Unsubmitted
Not Done
ReplyInline Actions

I just noticed these expectations are a little funny. The last line doesnt' seem to be doing anything.

And I think the second to last line should be CHECK-NEXT:.

Anyway, not related to this fix I guess.

sbc100: I just noticed these expectations are a little funny. The last line doesnt' seem to be doing…

test/ObjectYAML/wasm/start_section.yaml

# RUN: yaml2obj %s | obj2yaml | FileCheck %s # RUN: yaml2obj %s | obj2yaml | FileCheck %s
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: TYPE - Type: TYPE
Signatures: Signatures:
- Index: 0 - Index: 0
ReturnType: I32 ReturnType: NORESULT
ParamTypes: ParamTypes:
- F32
- F32
- Type: FUNCTION - Type: FUNCTION
FunctionTypes: [ 0, 0, 0 ] FunctionTypes: [ 0, 0, 0 ]
- Type: START - Type: START
StartFunction: 1 StartFunction: 1
- Type: CODE
Functions:
- Index: 0
Locals:
Body: 0B
- Index: 1
Locals:
Body: 0B
- Index: 2
Locals:
Body: 0B
... ...
# CHECK: --- !WASM # CHECK: --- !WASM
# CHECK: FileHeader: # CHECK: FileHeader:
# CHECK: Version: 0x00000001 # CHECK: Version: 0x00000001
# CHECK: Sections: # CHECK: Sections:
# CHECK: - Type: START # CHECK: - Type: START
# CHECK: StartFunction: 1 # CHECK: StartFunction: 1
# CHECK: ... # CHECK: ...