diff options
| -rw-r--r-- | llvm/include/llvm/MC/MCStreamer.h | 14 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/popsection.s | 21 |
2 files changed, 30 insertions, 5 deletions
diff --git a/llvm/include/llvm/MC/MCStreamer.h b/llvm/include/llvm/MC/MCStreamer.h index 5374e0ad573..628fb768856 100644 --- a/llvm/include/llvm/MC/MCStreamer.h +++ b/llvm/include/llvm/MC/MCStreamer.h @@ -307,11 +307,15 @@ public: bool PopSection() { if (SectionStack.size() <= 1) return false; - MCSectionSubPair oldSection = SectionStack.pop_back_val().first; - MCSectionSubPair curSection = SectionStack.back().first; - - if (oldSection != curSection) - ChangeSection(curSection.first, curSection.second); + auto I = SectionStack.end(); + --I; + MCSectionSubPair OldSection = I->first; + --I; + MCSectionSubPair NewSection = I->first; + + if (OldSection != NewSection) + ChangeSection(NewSection.first, NewSection.second); + SectionStack.pop_back(); return true; } diff --git a/llvm/test/MC/ELF/popsection.s b/llvm/test/MC/ELF/popsection.s new file mode 100644 index 00000000000..19f55688a1b --- /dev/null +++ b/llvm/test/MC/ELF/popsection.s @@ -0,0 +1,21 @@ +// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -s - | FileCheck %s + +// This used to crash. Test that it create an empty section instead. + + .pushsection foo + .popsection + +// CHECK: Section { +// CHECK: Index: 5 +// CHECK-NEXT: Name: foo +// CHECK-NEXT: Type: SHT_PROGBITS +// CHECK-NEXT: Flags [ (0x0) +// CHECK-NEXT: ] +// CHECK-NEXT: Address: 0x0 +// CHECK-NEXT: Offset: +// CHECK-NEXT: Size: 0 +// CHECK-NEXT: Link: 0 +// CHECK-NEXT: Info: 0 +// CHECK-NEXT: AddressAlignment: 1 +// CHECK-NEXT: EntrySize: 0 +// CHECK-NEXT: } |
