[all-commits] [llvm/llvm-project] fb432a: Reland "[NFCI] createCFGSimplificationPass(): migr...

[Roman Lebedev via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: fb432a51f430e3f2324c6a180bdbaa3627e0a0c8
      https://github.com/llvm/llvm-project/commit/fb432a51f430e3f2324c6a180bdbaa3627e0a0c8
  Author: Roman Lebedev <lebedev.ri at gmail.com>
  Date:   2020-07-16 (Thu, 16 Jul 2020)

  Changed paths:
    M llvm/include/llvm/Transforms/Scalar.h
    M llvm/include/llvm/Transforms/Scalar/SimplifyCFG.h
    M llvm/include/llvm/Transforms/Utils/Local.h
    A llvm/include/llvm/Transforms/Utils/SimplifyCFGOptions.h
    M llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
    M llvm/lib/Target/ARM/ARMTargetMachine.cpp
    M llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
    M llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
    M llvm/lib/Transforms/Scalar/Scalar.cpp
    M llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp

  Log Message:
  -----------
  Reland "[NFCI] createCFGSimplificationPass(): migrate to also take SimplifyCFGOptions"

This reverts commit 1067d3e176ea7b0b1942c163bf8c6c90107768c1,
which reverted commit b2018198c32a0535bb1f5bb5b40fbcf50d8d47b7,
because it introduced a Dependency Cycle between Transforms/Scalar and
Transforms/Utils.

So let's just move SimplifyCFGOptions.h into Utils/, thus avoiding
the cycle.


  Commit: 4028409d77f9ea77cec115104409cca605841728
      https://github.com/llvm/llvm-project/commit/4028409d77f9ea77cec115104409cca605841728
  Author: Roman Lebedev <lebedev.ri at gmail.com>
  Date:   2020-07-16 (Thu, 16 Jul 2020)

  Changed paths:
    M llvm/include/llvm/Transforms/Utils/SimplifyCFGOptions.h
    M llvm/lib/Target/AMDGPU/AMDGPUUnifyDivergentExitNodes.cpp

  Log Message:
  -----------
  Reland "[NFC] SimplifyCFGOptions: drop multi-parameter ctor, use default member-init"

This reverts commit 5831e86190966d58385678eb74b26aefacbfd101,
which reverted commit 90c1b0442a031d6cad686fdc4e5d3db03c3603a6
in preparation for reverting
commit b2018198c32a0535bb1f5bb5b40fbcf50d8d47b7 in
commit 1067d3e176ea7b0b1942c163bf8c6c90107768c1 due to the introducton
of a dependency cycle.

Now that the other revert is reverted with a fix, this can be relanded.


  Commit: b2dda33034934ead00ff8601ce5df487b0e760e9
      https://github.com/llvm/llvm-project/commit/b2dda33034934ead00ff8601ce5df487b0e760e9
  Author: Roman Lebedev <lebedev.ri at gmail.com>
  Date:   2020-07-16 (Thu, 16 Jul 2020)

  Changed paths:
    M llvm/include/llvm/Transforms/Scalar/SimplifyCFG.h

  Log Message:
  -----------
  [NFC] SimplifyCFGPass::SimplifyCFGPass(): use default SimplifyCFGOptions - we aren't deviating from them here


  Commit: 740a1da108ab9097268b509c85ed9ede7f4d5df5
      https://github.com/llvm/llvm-project/commit/740a1da108ab9097268b509c85ed9ede7f4d5df5
  Author: Roman Lebedev <lebedev.ri at gmail.com>
  Date:   2020-07-16 (Thu, 16 Jul 2020)

  Changed paths:
    M llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp

  Log Message:
  -----------
  [NFC] SimplifyCFG: refactor/deduplicate command-line settings override handling


Compare: https://github.com/llvm/llvm-project/compare/46c921003c2c...740a1da108ab