[llvm] 6ee55f9 - Fix test failure created by ef8c9135efcb

[Sam Clegg via llvm-commits]

Author: Sam Clegg
Date: 2021-09-14T07:35:05-07:00
New Revision: 6ee55f9ab57435ae72a070a9eff76f281082208f

URL: https://github.com/llvm/llvm-project/commit/6ee55f9ab57435ae72a070a9eff76f281082208f
DIFF: https://github.com/llvm/llvm-project/commit/6ee55f9ab57435ae72a070a9eff76f281082208f.diff

LOG: Fix test failure created by ef8c9135efcb

Followup to https://reviews.llvm.org/D108877 to fix test
failure.

Added: 
    

Modified: 
    lld/test/wasm/shared-needed.s
    lld/test/wasm/shared.s
    lld/test/wasm/shared64.s
    llvm/lib/ObjectYAML/WasmYAML.cpp

Removed: 
    


################################################################################
diff  --git a/lld/test/wasm/shared-needed.s b/lld/test/wasm/shared-needed.s
index 10ac40855d24..12c4597190a3 100644
--- a/lld/test/wasm/shared-needed.s
+++ b/lld/test/wasm/shared-needed.s
@@ -29,7 +29,6 @@ data:
 # SO1-NEXT:     TableSize:       0
 # SO1-NEXT:     TableAlignment:  0
 # SO1-NEXT:     Needed:          []
-# SO1-NEXT:     ExportInfo:      []
 # SO1-NEXT:   - Type:            TYPE
 
 # SO2:      Sections:
@@ -41,5 +40,4 @@ data:
 # SO2-NEXT:     TableAlignment:  0
 # SO2-NEXT:     Needed:
 # SO2-NEXT:       - shared-needed.s.tmp1.so
-# SO2-NEXT:     ExportInfo:      []
 # SO2-NEXT:   - Type:            TYPE

diff  --git a/lld/test/wasm/shared.s b/lld/test/wasm/shared.s
index a3f82cebad2b..7861485470ff 100644
--- a/lld/test/wasm/shared.s
+++ b/lld/test/wasm/shared.s
@@ -133,7 +133,6 @@ get_local_func_address:
 # CHECK-NEXT:     TableSize:       2
 # CHECK-NEXT:     TableAlignment:  0
 # CHECK-NEXT:     Needed:          []
-# CHECK-NEXT:     ExportInfo:      []
 # CHECK-NEXT:   - Type:            TYPE
 
 # check for import of __table_base and __memory_base globals

diff  --git a/lld/test/wasm/shared64.s b/lld/test/wasm/shared64.s
index 42fc8298a6da..86d5a521ab33 100644
--- a/lld/test/wasm/shared64.s
+++ b/lld/test/wasm/shared64.s
@@ -134,7 +134,6 @@ get_local_func_address:
 # CHECK-NEXT:     TableSize:       2
 # CHECK-NEXT:     TableAlignment:  0
 # CHECK-NEXT:     Needed:          []
-# CHECK-NEXT:     ExportInfo:      []
 # CHECK-NEXT:   - Type:            TYPE
 
 # check for import of __table_base and __memory_base globals

diff  --git a/llvm/lib/ObjectYAML/WasmYAML.cpp b/llvm/lib/ObjectYAML/WasmYAML.cpp
index 59da56891f66..133a2bc1519e 100644
--- a/llvm/lib/ObjectYAML/WasmYAML.cpp
+++ b/llvm/lib/ObjectYAML/WasmYAML.cpp
@@ -55,7 +55,7 @@ static void sectionMapping(IO &IO, WasmYAML::DylinkSection &Section) {
   IO.mapRequired("TableSize", Section.TableSize);
   IO.mapRequired("TableAlignment", Section.TableAlignment);
   IO.mapRequired("Needed", Section.Needed);
-  IO.mapRequired("ExportInfo", Section.ExportInfo);
+  IO.mapOptional("ExportInfo", Section.ExportInfo);
 }
 
 static void sectionMapping(IO &IO, WasmYAML::NameSection &Section) {