[PATCH] D60836: [WebAssembly] Object: Improve error messages on invalid section

[Sam Clegg via Phabricator via llvm-commits]

sbc100 updated this revision to Diff 195943.
sbc100 added a comment.

- add test]


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D60836/new/

https://reviews.llvm.org/D60836

Files:
  llvm/lib/Object/WasmObjectFile.cpp
  llvm/test/Object/wasm-invalid-file.yaml


Index: llvm/test/Object/wasm-invalid-file.yaml
===================================================================
--- llvm/test/Object/wasm-invalid-file.yaml
+++ llvm/test/Object/wasm-invalid-file.yaml
@@ -14,3 +14,9 @@
 # RUN: not llvm-objdump -h %t.wasm 2>&1 | FileCheck %s -check-prefix=CHECK-SECTION-SIZE
 
 # CHECK-SECTION-SIZE: '{{.*}}.wasm': Section too large
+
+# RUN: yaml2obj %s > %t.wasm
+# # Append an section with invalid type (type 0x20, size 0x1, content 0x0)
+# RUN: echo -e -n "\x20\x01\x00" >> %t.wasm
+# RUN: not llvm-objdump -h %t.wasm 2>&1 | FileCheck %s -check-prefix=CHECK-SECTION-TYPE
+# CHECK-SECTION-TYPE: '{{.*}}.wasm': Invalid section type: 32
Index: llvm/lib/Object/WasmObjectFile.cpp
===================================================================
--- llvm/lib/Object/WasmObjectFile.cpp
+++ llvm/lib/Object/WasmObjectFile.cpp
@@ -319,8 +319,8 @@
   case wasm::WASM_SEC_DATACOUNT:
     return parseDataCountSection(Ctx);
   default:
-    return make_error<GenericBinaryError>("Bad section type",
-                                          object_error::parse_failed);
+    return make_error<GenericBinaryError>(
+        "Invalid section type: " + Twine(Sec.Type), object_error::parse_failed);
   }
 }
 
@@ -1607,7 +1607,7 @@
   case wasm::WASM_SEC_EVENT:
     return WASM_SEC_ORDER_EVENT;
   default:
-    llvm_unreachable("invalid section");
+    return WASM_SEC_ORDER_NONE;
   }
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60836.195943.patch
Type: text/x-patch
Size: 1421 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190420/5fc0a2a3/attachment.bin>