llvm-dwp: Add error handling for multiple type sections in a dwp file.

llvm-svn: 269851

3 files changed, 6 insertions, 1 deletions

diff --git a/llvm/test/tools/llvm-dwp/Inputs/multiple_type_sections.dwp b/llvm/test/tools/llvm-dwp/Inputs/multiple_type_sections.dwp
new file mode 100644
index 00000000000..d313213c2b1
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/Inputs/multiple_type_sections.dwp
diff --git a/llvm/test/tools/llvm-dwp/X86/multiple_type_sections.test b/llvm/test/tools/llvm-dwp/X86/multiple_type_sections.test
new file mode 100644
index 00000000000..7953b88ad3d
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/X86/multiple_type_sections.test
@@ -0,0 +1,3 @@
+RUN: not llvm-dwp %p/../Inputs/multiple_type_sections.dwp -o %t 2>&1 | FileCheck %s
+
+CHECK: error: multiple type unit sections in .dwp file
diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp
index 60d07207ed4..1e1cb527b28 100644
--- a/llvm/tools/llvm-dwp/llvm-dwp.cpp
+++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp
@@ -537,7 +537,9 @@ static Error write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
       }
 
       if (!CurTypesSection.empty()) {
-        assert(CurTypesSection.size() == 1);
+        if (CurTypesSection.size() != 1)
+          return make_error<DWPError>(
+              "multiple type unit sections in .dwp file");
         DWARFUnitIndex TUIndex(DW_SECT_TYPES);
         DataExtractor TUIndexData(CurTUIndexSection,
                                   ErrOrObj->getBinary()->isLittleEndian(), 0);