[PATCH] D14668: [WinEH] Move WinEHFuncInfo from MachineModuleInfo to MachineFunction

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Fri Nov 13 15:46:30 PST 2015


rnk created this revision.
rnk added a reviewer: majnemer.
rnk added a subscriber: llvm-commits.

Now that there is a one-to-one mapping from MachineFunction to
WinEHFuncInfo, we don't need to use a DenseMap to select the right
WinEHFuncInfo for the current funclet.

The main challenge here is that X86WinEHStatePass is an IR pass that
doesn't have access to the MachineFunction. I gave it its own
WinEHFuncInfo object that it uses to calculate state numbers, which it
then throws away. As long as nobody creates or removes EH pads between
this pass and SDAG construction, we will get the same state numbers.

The other thing X86WinEHStatePass does is to mark the EH registration
node. Instead of communicating which alloca was the registration through
WinEHFuncInfo, I added the llvm.x86.seh.ehregnode intrinsic.  This
intrinsic generates no code and simply marks the alloca in use.

http://reviews.llvm.org/D14668

Files:
  include/llvm/CodeGen/MachineFunction.h
  include/llvm/CodeGen/MachineModuleInfo.h
  include/llvm/CodeGen/WinEHFuncInfo.h
  include/llvm/IR/IntrinsicsX86.td
  lib/CodeGen/AsmPrinter/WinException.cpp
  lib/CodeGen/AsmPrinter/WinException.h
  lib/CodeGen/MachineFunction.cpp
  lib/CodeGen/MachineModuleInfo.cpp
  lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp
  lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  lib/Target/X86/X86FrameLowering.cpp
  lib/Target/X86/X86ISelLowering.cpp
  lib/Target/X86/X86WinEHState.cpp
  test/CodeGen/X86/seh-catch-all-win32.ll
  test/CodeGen/X86/seh-stack-realign.ll

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14668.40183.patch
Type: text/x-patch
Size: 30780 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151113/c2b3411e/attachment.bin>


More information about the llvm-commits mailing list