[CodeGen] Fix lpad padding at section start after empty block

If a landing pad is at the very start of a split section, it has to be
padded by a nop instruction. Otherwise its offset is marked as zero in
the LSDA, which means no landing pad (leading it to be skipped).

LLVM already handles this. If a landing pad is the first machine block
in a section, a nop is inserted to ensure a non-zero offset. However, if
the landing pad is preceeded by an empty block, the nop would be
omitted.

To fix this, this patch checks not whether a block is the first in
section, but instead whether it is the first *non-empty* block in the
section.

Author: pzfl

llvm/lib/CodeGen/BasicBlockSections.cpp

@@ -265,8 +265,29 @@ void llvm::sortBasicBlocksAndUpdateBranches(
 // zero implies "no landing pad." This function inserts a NOP just before the EH
 // pad label to ensure a nonzero offset.
 void llvm::avoidZeroOffsetLandingPad(MachineFunction &MF) {
+  llvm::SmallDenseMap<MBBSectionID, bool> EmptySections;
+  auto IsFirstNonEmptyBBInSection = [&](const MachineBasicBlock &MBB) {
+    auto It = EmptySections.end();
+    if (MBB.isBeginSection()) {
+      auto Insert = EmptySections.insert({MBB.getSectionID(), true});
+      It = Insert.first;
+      assert(Insert.second && "Section's begin block is encountered before any "
+                              "of its other blocks");
+    } else {
+      It = EmptySections.find(MBB.getSectionID());
+      assert(It != EmptySections.end() &&
+             "Non-begin MBB found in section before its begin MBB");
+    }
+    bool *IsSectionEmpty = &It->second;
+    if (*IsSectionEmpty && !MBB.empty()) {
+      *IsSectionEmpty = false;
+      return true;
+    }
+    return false;
+  };
+
   for (auto &MBB : MF) {
-    if (MBB.isBeginSection() && MBB.isEHPad()) {
+    if (IsFirstNonEmptyBBInSection(MBB) && MBB.isEHPad()) {
       MachineBasicBlock::iterator MI = MBB.begin();
       while (!MI->isEHLabel())
         ++MI;

llvm/test/CodeGen/Generic/machine-function-splitter.ll

@@ -610,6 +610,36 @@ cold_asm_target:
   ret void
 }
 
+define i32 @foo21(i1 zeroext %0) personality ptr @__gxx_personality_v0 !prof !14 {
+;; Check that nop is inserted just before the EH pad if it is the first
+;; instruction in a section (but is preceeded by another empty block).
+; MFS-DEFAULTS-LABEL:         foo21
+; MFS-DEFAULTS-X86-LABEL:     callq   baz
+; MFS-DEFAULTS-X86:           .section        .text.split.foo21,"ax",@progbits
+; MFS-DEFAULTS-X86-NEXT:      foo21.cold:
+; MFS-DEFAULTS-X86:           nop
+; MFS-DEFAULTS-X86:           callq   _Unwind_Resume@PLT
+entry:
+  br i1 %0, label %try, label %unreachable, !prof !17
+
+try:
+  invoke void @_Z1fv()
+          to label %try.cont unwind label %lpad, !prof !17
+
+try.cont:
+  %1 = call i32 @baz()
+  ret i32 %1
+
+unreachable:
+  unreachable
+
+lpad:
+  %2 = landingpad { ptr, i32 }
+          cleanup
+          catch ptr @_ZTIi
+  resume { ptr, i32 } %2
+}
+
 declare i32 @bar()
 declare i32 @baz()
 declare i32 @bam()