[all-commits] [llvm/llvm-project] 840845: Fix merge issues in b288f7d6bb8fdd21d27ba755302db1...

[Amy Huang via All-commits]

  Branch: refs/heads/release/9.x
  Home:   https://github.com/llvm/llvm-project
  Commit: 840845a1eeae2dc039600ef826de21347edd53ef
      https://github.com/llvm/llvm-project/commit/840845a1eeae2dc039600ef826de21347edd53ef
  Author: Amy Huang <akhuang at google.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M llvm/lib/CodeGen/MachineFunction.cpp
    M llvm/unittests/CodeGen/MachineInstrTest.cpp

  Log Message:
  -----------
  Fix merge issues in b288f7d6bb8fdd21d27ba755302db194c181fdaf