Changes from Git (git


  1. LiveRegUnits.h - reduce MachineRegisterInfo.h include. NFC. (details)
  2. [WebAssembly] Fix fixEndsAtEndOfFunction for try-catch (details)
Commit 3c83b967cf223ce6a2e0813e48b64f7689512f20 by llvm-dev
LiveRegUnits.h - reduce MachineRegisterInfo.h include. NFC.

We only need to include MachineInstrBundle.h, but exposes an implicit dependency in MachineOutliner.h.

Also, remove duplicate includes from LiveRegUnits.cpp + MachineOutliner.cpp.
The file was modifiedllvm/include/llvm/CodeGen/LiveRegUnits.h
The file was modifiedllvm/include/llvm/CodeGen/MachineOutliner.h
The file was modifiedllvm/lib/CodeGen/LiveRegUnits.cpp
The file was modifiedllvm/lib/CodeGen/MachineOutliner.cpp
Commit d25c17f3175b344420c1f30040b206a47a512c9d by aheejin
[WebAssembly] Fix fixEndsAtEndOfFunction for try-catch

When the function return type is non-void and `end` instructions are at
the very end of a function, CFGStackify's `fixEndsAtEndOfFunction`
function fixes the corresponding block/loop/try's type to match the
function's return type. This is applied to consecutive `end` markers at
the end of a function. For example, when the function return type is
block i32    ;; return type is fixed to i32
  loop i32   ;; return type is fixed to i32

But try-catch is a little different, because it consists of two parts:
a try part and a catch part, and both parts' return type should satisfy
the function's return type. Which means,
try i32      ;; return type is fixed to i32
  block i32  ;; this should be changed i32 too!
As you can see in this example, it is not sufficient to only `end`
instructions at the end of a function; in case of `try`, we should
check instructions before `catch`es, in case their corresponding `try`'s
type has been fixed.

This changes `fixEndsAtEndOfFunction`'s algorithm to use a worklist
that contains a reverse iterator, each of which is a starting point for
a new backward `end` instruction search.


Reviewed By: dschuff, tlively

Differential Revision:
The file was modifiedllvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp
The file was modifiedllvm/test/CodeGen/WebAssembly/cfg-stackify-eh.ll