summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ObjectYAML
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2017-05-09 23:48:41 +0000
committerSam Clegg <sbc@chromium.org>2017-05-09 23:48:41 +0000
commit2ffff5af851cffe62aeacc33f62d474982ee0579 (patch)
tree6902f92fbd91d0946ebba01de1c3cd04eb739860 /llvm/lib/ObjectYAML
parent78046e462417425daae02ddc7a472df117dfd05e (diff)
downloadbcm5719-llvm-2ffff5af851cffe62aeacc33f62d474982ee0579.tar.gz
bcm5719-llvm-2ffff5af851cffe62aeacc33f62d474982ee0579.zip
[WebAssembly] Improve libObject support for wasm imports and exports
Previously we had only supported the importing and exporting of functions and globals. Also, add usefull overload of getWasmSymbol() and getNumberOfSymbols() in support of lld port. Differential Revision: https://reviews.llvm.org/D33011 llvm-svn: 302601
Diffstat (limited to 'llvm/lib/ObjectYAML')
-rw-r--r--llvm/lib/ObjectYAML/WasmYAML.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/ObjectYAML/WasmYAML.cpp b/llvm/lib/ObjectYAML/WasmYAML.cpp
index c5d1b438ee2..514ae55b3b6 100644
--- a/llvm/lib/ObjectYAML/WasmYAML.cpp
+++ b/llvm/lib/ObjectYAML/WasmYAML.cpp
@@ -265,8 +265,12 @@ void MappingTraits<WasmYAML::Import>::mapping(IO &IO,
if (Import.Kind == wasm::WASM_EXTERNAL_FUNCTION) {
IO.mapRequired("SigIndex", Import.SigIndex);
} else if (Import.Kind == wasm::WASM_EXTERNAL_GLOBAL) {
- IO.mapRequired("GlobalType", Import.GlobalType);
- IO.mapRequired("GlobalMutable", Import.GlobalMutable);
+ IO.mapRequired("GlobalType", Import.Global.Type);
+ IO.mapRequired("GlobalMutable", Import.Global.Mutable);
+ } else if (Import.Kind == wasm::WASM_EXTERNAL_TABLE) {
+ IO.mapRequired("Table", Import.Table);
+ } else if (Import.Kind == wasm::WASM_EXTERNAL_MEMORY ) {
+ IO.mapRequired("Memory", Import.Memory);
} else {
llvm_unreachable("unhandled import type");
}
OpenPOWER on IntegriCloud