summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/MC/MachObjectWriter.cpp8
-rw-r--r--llvm/test/MC/X86/check-end-of-data-region.s8
2 files changed, 15 insertions, 1 deletions
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index c7eaa76ace3..25f451cd4fa 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -945,7 +945,13 @@ void MachObjectWriter::writeObject(MCAssembler &Asm,
it != ie; ++it) {
const DataRegionData *Data = &(*it);
uint64_t Start = getSymbolAddress(*Data->Start, Layout);
- uint64_t End = getSymbolAddress(*Data->End, Layout);
+ uint64_t End;
+ if (Data->End)
+ End = getSymbolAddress(*Data->End, Layout);
+ else
+ report_fatal_error("Data region not terminated");
+
+
DEBUG(dbgs() << "data in code region-- kind: " << Data->Kind
<< " start: " << Start << "(" << Data->Start->getName() << ")"
<< " end: " << End << "(" << Data->End->getName() << ")"
diff --git a/llvm/test/MC/X86/check-end-of-data-region.s b/llvm/test/MC/X86/check-end-of-data-region.s
new file mode 100644
index 00000000000..3f7d9b617ef
--- /dev/null
+++ b/llvm/test/MC/X86/check-end-of-data-region.s
@@ -0,0 +1,8 @@
+// RUN: not llvm-mc -triple=x86_64-apple-darwin -filetype=obj -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
+
+.align 4
+.data_region jt32
+foo:
+ .long 0
+
+// CHECK-ERROR: LLVM ERROR: Data region not terminated
OpenPOWER on IntegriCloud