diff options
| -rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/ARM/multi-section-mapping.s | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp index 6fa890ba1cd..4d6c52f3cd4 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp @@ -464,7 +464,7 @@ public: void emitUnwindRaw(int64_t Offset, const SmallVectorImpl<uint8_t> &Opcodes); void ChangeSection(MCSection *Section, const MCExpr *Subsection) override { - LastMappingSymbols[getPreviousSection().first] = std::move(LastEMSInfo); + LastMappingSymbols[getCurrentSection().first] = std::move(LastEMSInfo); MCELFStreamer::ChangeSection(Section, Subsection); auto LastMappingSymbol = LastMappingSymbols.find(Section); if (LastMappingSymbol != LastMappingSymbols.end()) { diff --git a/llvm/test/MC/ARM/multi-section-mapping.s b/llvm/test/MC/ARM/multi-section-mapping.s index e4b7146e4b0..7e62b10f5b0 100644 --- a/llvm/test/MC/ARM/multi-section-mapping.s +++ b/llvm/test/MC/ARM/multi-section-mapping.s @@ -21,14 +21,31 @@ .arm add r0, r0, r0 +@ Similarly no $t if we change back .starts_thumb using .pushsection + .pushsection .starts_thumb + .thumb + adds r0, r0, r0 + +@ When we change back to .text using .popsection .thumb is still active, so we +@ should emit a $t + .popsection + add r0, r0, r0 + +@ .ident does a push then pop of the .comment section, so the .word should +@ cause $d to appear in the .text section + .ident "ident" + .word 0 + @ With all those constraints, we want: -@ + .text to have $a at 0 and no others +@ + .text to have $a at 0, $t at 8, $d at 12 @ + .wibble to have $a at 0 @ + .starts_thumb to have $t at 0 @ + .starts_data to have $d at 0 @ CHECK: 00000000 .text 00000000 $a @ CHECK-NEXT: 00000000 .wibble 00000000 $a +@ CHECK-NEXT: 0000000a .text 00000000 $d @ CHECK-NEXT: 00000000 .starts_thumb 00000000 $t +@ CHECK-NEXT: 00000008 .text 00000000 $t @ CHECK-NOT: ${{[adt]}} |
