[PATCH] D46330: Create a MachineBasicBlock for created IR-level BasicBlock

[Jessica Paquette via Phabricator via llvm-commits]

paquette created this revision.
paquette added a reviewer: chandlerc.

While running the lit tests for the most recent version of https://reviews.llvm.org/D45916 (https://reviews.llvm.org/D45916), I found that a couple tests for this pass suddenly started segfaulting. Since the outliner wasn't actually doing anything to the code in either of these tests I got curious.

I found that the pass doesn’t completely create the machine-level constructs necessary to actually add a MachineFunction and MachineBasicBlock to the module. This patch adds in those missing bits. After this, adding the outliner before this pass won’t cause it to segfault.

You can recreate this behaviour by adding the MachineOutliner directly before the pass and having it return false immediately.


https://reviews.llvm.org/D46330

Files:
  lib/Target/X86/X86RetpolineThunks.cpp


Index: lib/Target/X86/X86RetpolineThunks.cpp
===================================================================
--- lib/Target/X86/X86RetpolineThunks.cpp
+++ lib/Target/X86/X86RetpolineThunks.cpp
@@ -215,6 +215,15 @@
   IRBuilder<> Builder(Entry);
 
   Builder.CreateRetVoid();
+
+  // MachineFunctions/MachineBasicBlocks aren't created automatically for the
+  // IR-level constructs we already made. Create them and insert them into the
+  // module.
+  MachineFunction &MF = MMI->getOrCreateMachineFunction(*F);
+  MachineBasicBlock *EntryMBB = MF.CreateMachineBasicBlock(Entry);
+
+  // Insert EntryMBB into MF. It's not in the module until we do this.
+  MF.insert(MF.begin(), EntryMBB);
 }
 
 void X86RetpolineThunks::insertRegReturnAddrClobber(MachineBasicBlock &MBB,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46330.144771.patch
Type: text/x-patch
Size: 776 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180501/9f996ae6/attachment.bin>