Jeremy Morse 763ae301ec [SimplifyCFG] Retain debug info when threading jumps with critical edges ...

Fixes bug 38023: https://bugs.llvm.org/show_bug.cgi?id=38023

The SimplifyCFG pass will perform jump threading in some cases where
doing so is trivial and would simplify the CFG. When folding a series
of blocks with redundant conditional branches into an unconditional "critical
edge" block, it does not keep the debug location associated with the previous
conditional branch.

This patch fixes the bug described by copying the debug info from the
old conditional branch to the new unconditional branch instruction, and
adds a regression test for the SimplifyCFG pass that covers this case.

Patch by Stephen Tozer!

Differential Revision: https://reviews.llvm.org/D59206


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355833 91177308-0d34-0410-b5e6-96231b3b80d8

2019-03-11 16:23:59 +00:00

..

AArch64

[SimplifyCFG] Rewrite SinkThenElseCodeToEnd

2016-08-22 19:07:15 +00:00

AMDGPU

AMDGPU: Remove -mcpu=SI

2017-08-07 18:30:35 +00:00

ARM

[SimplifyCFG] use pass options and remove the latesimplifycfg pass

2017-10-28 18:43:07 +00:00

Hexagon

[Hexagon] Remove trailing spaces, NFC

2017-11-22 20:43:00 +00:00

Mips

[MIPS] add overrides for isCheapToSpeculateCttz() and isCheapToSpeculateCtlz()

2015-11-11 17:24:56 +00:00

PowerPC

Fix some misc. -enable-var-scope violations

2017-11-13 01:47:52 +00:00

RISCV

[RISCV] Implement isTruncateFree

2018-04-26 13:37:00 +00:00

SPARC

…

X86

[SimplifyCFG] Put an alignment on generated switch tables

2018-09-12 09:54:17 +00:00

2002-05-21-PHIElimination.ll

…

2002-09-24-PHIAssertion.ll

…

2003-03-07-DominateProblem.ll

…

2003-08-05-InvokeCrash.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

2003-08-17-BranchFold.ll

…

2003-08-17-BranchFoldOrdering.ll

…

2003-08-17-FoldSwitch-dbg.ll

[opaque pointer type] Add textual IR support for explicit type parameter to gep operator

2015-03-13 18:20:45 +00:00

2003-08-17-FoldSwitch.ll

regenerate checks

2016-03-28 22:12:21 +00:00

2004-12-10-SimplifyCFGCrash.ll

…

2005-06-16-PHICrash.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

2005-08-01-PHIUpdateFail.ll

[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction

2015-02-27 19:29:02 +00:00

2005-10-02-InvokeSimplify.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

2005-12-03-IncorrectPHIFold.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

2006-02-17-InfiniteUnroll.ll

…

2006-06-12-InfLoop.ll

…

2006-08-03-Crash.ll

[PPC] Remove Darwin support from POWER backend.

2018-08-28 01:18:29 +00:00

2006-10-19-UncondDiv.ll

…

2006-12-08-Ptr-ICmp-Branch.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

2007-11-22-InvokeNoUnwind.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

2007-12-21-Crash.ll

[opaque pointer type] Add textual IR support for explicit type parameter to the call instruction

2015-04-16 23:24:18 +00:00

2008-01-02-hoist-fp-add.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

2008-05-16-PHIBlockMerge.ll

[SimlifyCFG] Prevent passes from destroying canonical loop structure, especially for nested loops

2016-03-29 04:08:57 +00:00

2008-07-13-InfLoopMiscompile.ll

remove the metadata added with r267827

2016-04-30 00:02:36 +00:00

2008-09-08-MultiplePred.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

2008-09-17-SpeculativeHoist.ll

…

2008-10-03-SpeculativelyExecuteBeforePHI.ll

…

2008-12-06-SingleEntryPhi.ll

…

2008-12-16-DCECond.ll

[opaque pointer type] Add textual IR support for explicit type parameter to the call instruction

2015-04-16 23:24:18 +00:00

2009-01-18-PHIPropCrash.ll

…

2009-05-12-externweak.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

2010-03-30-InvokeCrash.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

2011-03-08-UnreachableUse.ll

…

2011-09-05-TrivialLPad.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

assume.ll

…

attr-convergent.ll

[SimplifyCFG] Don't fold conditional branches that contain calls to convergent functions.

2016-02-12 21:01:36 +00:00

attr-noduplicate.ll

[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction

2015-02-27 19:29:02 +00:00

basictest.ll

[DebugInfo] Add DILabel metadata and intrinsic llvm.dbg.label.

2018-05-09 02:40:45 +00:00

bbi-23595.ll

[DWARF] LLVM ERROR: Broken function found, while removing Debug Intrinsics.

2019-02-11 10:16:38 +00:00

branch-cond-merge.ll

…

branch-cond-prop.ll

…

branch-fold-dbg.ll

Remove the obsolete offset parameter from @llvm.dbg.value

2017-07-28 20:21:02 +00:00

branch-fold-test.ll

…

branch-fold-three.ll

[SimplifyCFG] add tests for cross block compare folding; NFC

2018-12-03 16:55:29 +00:00

branch-fold-threshold.ll

[SimplifyCFG] Fix a cost modeling oversight in branch commoning

2018-08-30 00:03:02 +00:00

branch-fold.ll

…

branch-phi-thread.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

BrUnwind.ll

…

bug-25299.ll

[SimplifyCFG] Extend SimplifyResume to handle phi of trivial landing pad.

2016-01-10 05:48:01 +00:00

clamp.ll

[SimplifyCFG] Add test for r229099

2015-02-13 11:08:40 +00:00

combine-parallel-mem-md.ll

Introduce llvm.loop.parallel_accesses and llvm.access.group metadata.

2018-12-20 04:58:07 +00:00

common-dest-folding.ll

[opaque pointer type] Add textual IR support for explicit type parameter to the call instruction

2015-04-16 23:24:18 +00:00

ConditionalTrappingConstantExpr.ll

[Constant] remove fdiv and frem from canTrap()

2016-08-29 15:27:17 +00:00

CoveredLookupTable.ll

[SimplifyCFG] use pass options and remove the latesimplifycfg pass

2017-10-28 18:43:07 +00:00

critedge-assume.ll

Remove alignment argument from memcpy/memmove/memset in favour of alignment attributes (Step 1)

2018-01-19 17:13:12 +00:00

dbginfo.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

dce-cond-after-folding-terminator.ll

Revert "Simplify blockaddress usage before giving up in MergeBlockIntoPredecessor"

2018-06-18 23:20:08 +00:00

DeadSetCC.ll

…

debug-info-thread-phi.ll

[SimplifyCFG] Retain debug info when threading jumps with critical edges

2019-03-11 16:23:59 +00:00

div-rem-pairs.ll

[SimplifyCFG] update test comments; NFC

2017-09-12 23:28:11 +00:00

duplicate-landingpad.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

duplicate-phis.ll

…

empty-catchpad.ll

[WinEH] Simplify unreachable catchpads

2016-01-05 02:37:41 +00:00

empty-cleanuppad.ll

Add address space mangling to lifetime intrinsics

2017-04-10 20:18:21 +00:00

EmptyBlockMerge.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

EqualPHIEdgeBlockMerge.ll

[SimlifyCFG] Prevent passes from destroying canonical loop structure, especially for nested loops

2016-03-29 04:08:57 +00:00

extract-cost.ll

…

fold-branch-debuginvariant.ll

[SimplifyCFG] Fix a debug invariant bug in FoldBranchToCommonDest()

2018-05-18 08:52:15 +00:00

fold-debug-info.ll

[SimplifyCFG] Fix a crash when folding PHIs.

2018-05-08 23:28:15 +00:00

ForwardSwitchConditionToPHI.ll

[SimplifyCFG] use pass options and remove the latesimplifycfg pass

2017-10-28 18:43:07 +00:00

gepcost.ll

[TTI] Fix getGEPCost() for geps with a single operand.

2017-09-01 19:54:08 +00:00

guards.ll

[SimplifyCFG] Regenerate some test cases using update_test_checks.py to prepare for an upcoming commit. NFC

2017-10-31 19:03:49 +00:00

hoist-common-code.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

hoist-dbgvalue-inlined.ll

[DebugInfo] Add DILabel metadata and intrinsic llvm.dbg.label.

2018-05-09 02:40:45 +00:00

hoist-dbgvalue.ll

Remove the obsolete offset parameter from @llvm.dbg.value

2017-07-28 20:21:02 +00:00

hoist-with-range.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

HoistCode.ll

…

implied-and-or.ll

[SimplifyCFG] auto-generate complete checks; NFC

2018-11-29 16:28:37 +00:00

implied-cond-matching-false-dest.ll

[ValueTracking] Improve isImpliedCondition when the dominating cond is false.

2016-04-25 17:23:36 +00:00

implied-cond-matching-imm.ll

[ValueTracking] Improve isImpliedCondition for matching LHS and Imm RHSs.

2016-05-05 15:39:18 +00:00

implied-cond-matching.ll

Fix typo from r267432.

2016-04-25 18:20:27 +00:00

implied-cond.ll

[SimplifyCFG] Constant fold a branch implied by it's incoming edge

2015-10-29 03:11:49 +00:00

indirectbr.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

InfLoop.ll

[SimplifyCFG] Fix for "endless" loop after dead code removal (Alternative to

2016-02-03 23:54:25 +00:00

inline-asm-sink.ll

Fix some misc. -enable-var-scope violations

2017-11-13 01:47:52 +00:00

invoke_unwind.ll

[SimplifyCFG] Extend SimplifyResume to handle phi of trivial landing pad.

2016-01-10 05:48:01 +00:00

invoke.ll

llvm: Add support for "-fno-delete-null-pointer-checks"

2018-07-09 22:27:23 +00:00

iterative-simplify.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

lifetime.ll

Add address space mangling to lifetime intrinsics

2017-04-10 20:18:21 +00:00

MagicPointer.ll

[opaque pointer type] Add textual IR support for explicit type parameter to gep operator

2015-03-13 18:20:45 +00:00

merge-cleanuppads.ll

[SimplifyCFG] Merge together cleanuppads

2016-02-20 01:07:45 +00:00

merge-cond-stores-2.ll

[SimplifyCFG] When merging conditional stores, don't count the store we're merging against the PHINodeFoldingThreshold

2017-11-03 21:08:13 +00:00

merge-cond-stores.ll

[NFC] Fixed build, updated tests

2018-08-12 18:32:53 +00:00

multiple-phis.ll

[SimplifyCFG] Regenerate some test cases using update_test_checks.py to prepare for an upcoming commit. NFC

2017-10-31 19:03:49 +00:00

no_speculative_loads_with_asan.ll

Hardware-assisted AddressSanitizer (llvm part).

2017-12-09 00:21:41 +00:00

no_speculative_loads_with_tsan.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

no-md-sink.ll

[SimplifyCFG] don't sink common insts too soon (PR34603)

2017-12-14 22:05:20 +00:00

noreturn-call.ll

…

opt-for-fuzzing.ll

[SimplifyCFG] Create attribute for fuzzing-specific optimizations.

2018-03-22 17:07:51 +00:00

phi-undef-loadstore.ll

llvm: Add support for "-fno-delete-null-pointer-checks"

2018-07-09 22:27:23 +00:00

PhiBlockMerge2.ll

…

PhiBlockMerge.ll

regenerate checks

2016-03-28 22:12:21 +00:00

PhiEliminate2.ll

propagate 'unpredictable' metadata on select instructions

2016-03-17 15:30:52 +00:00

PhiEliminate3.ll

…

PhiEliminate.ll

…

PHINode.ll

…

PhiNoEliminate.ll

…

pr33605.ll

[SimplifyCFG] Defer folding unconditional branches to LateSimplifyCFG if it can destroy canonical loop structure.

2017-07-19 08:53:34 +00:00

pr34131.ll

[SimplifyCFG] remove checks for crasher test from r310481

2017-08-09 18:56:26 +00:00

pr35774.ll

[SimplifyCFG] Stop hoisting musttail calls incorrectly.

2017-12-31 16:47:16 +00:00

pr39807.ll

[DebugInfo] Give inlinable calls DILocs (PR39807)

2018-11-28 17:58:45 +00:00

PR9946.ll

…

PR16069.ll

regenerate checks

2016-03-28 22:12:21 +00:00

PR17073.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

PR25267.ll

[SimplifyCFG] Don't use-after-free an SSA value

2015-10-21 18:22:24 +00:00

PR27615-simplify-cond-br.ll

[DebugInfo] Add DILabel metadata and intrinsic llvm.dbg.label.

2018-05-09 02:40:45 +00:00

PR29163.ll

[SimplifyCFG] Hoisting invalidates metadata

2016-08-29 17:14:08 +00:00

PR30210.ll

Add a test for r280191

2016-09-16 02:43:36 +00:00

preserve-branchweights-partial.ll

IR: Make metadata typeless in assembly

2014-12-15 19:07:53 +00:00

preserve-branchweights-switch-create.ll

IR: Make metadata typeless in assembly

2014-12-15 19:07:53 +00:00

preserve-branchweights.ll

[SimplifyCFG] Regenerate preserve-branchweights.ll test. NFC

2018-11-14 15:27:07 +00:00

preserve-llvm-loop-metadata.ll

[SimplifyCFG] use pass options and remove the latesimplifycfg pass

2017-10-28 18:43:07 +00:00

preserve-load-metadata-2.ll

Preserve load alignment and dereferenceable metadata during some transformations

2015-11-02 17:53:51 +00:00

preserve-load-metadata-3.ll

Preserve load alignment and dereferenceable metadata during some transformations

2015-11-02 17:53:51 +00:00

preserve-load-metadata.ll

Preserve load alignment and dereferenceable metadata during some transformations

2015-11-02 17:53:51 +00:00

preserve-make-implicit-on-switch-to-br.ll

[ConstantFoldTerminator] Preserve make.implicit metadata when converting SwitchInst to BranchInst

2015-08-07 19:30:12 +00:00

preserve-store-alignment.ll

[SimplifyCFG] Fix for PR34219: Preserve alignment after merging conditional stores.

2017-08-29 20:06:24 +00:00

rangereduce.ll

[SimplifyCFG] use pass options and remove the latesimplifycfg pass

2017-10-28 18:43:07 +00:00

remove-debug-2.ll

[DebugInfo] Add DILabel metadata and intrinsic llvm.dbg.label.

2018-05-09 02:40:45 +00:00

remove-debug.ll

[DebugInfo] Create merged locations for instructions other than calls

2018-04-12 20:58:24 +00:00

return-merge.ll

…

seh-nounwind.ll

Move the personality function from LandingPadInst to Function

2015-06-17 20:52:32 +00:00

select-gep.ll

[SimplifyCFG] Regenerate some test cases using update_test_checks.py to prepare for an upcoming commit. NFC

2017-10-31 19:03:49 +00:00

sink-common-code.ll

[SimplifyCFG] don't sink common insts too soon (PR34603)

2017-12-14 22:05:20 +00:00

speculate-call.ll

[ValueTracking] Teach isSafeToSpeculativelyExecute() about the speculatable attribute

2017-04-28 21:13:09 +00:00

speculate-dbgvalue.ll

[DebugInfo] Add DILabel metadata and intrinsic llvm.dbg.label.

2018-05-09 02:40:45 +00:00

speculate-math.ll

[InstCombine] InstCombine and InstSimplify for minimum and maximum

2018-10-19 19:01:26 +00:00

speculate-store.ll

[SimplifyCFG] propagate branch metadata when creating select (PR26636)

2016-03-26 23:30:50 +00:00

speculate-vector-ops.ll

…

speculate-with-offset.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

SpeculativeExec.ll

[SimplifyCFG] Regenerate some test cases using update_test_checks.py to prepare for an upcoming commit. NFC

2017-10-31 19:03:49 +00:00

statepoint-invoke-unwind.ll

[gc.statepoint] Change gc.statepoint intrinsic's return type to token type instead of i32 type

2015-12-26 07:54:32 +00:00

suppress-zero-branch-weights.ll

[SimplifyCFG] Fix a test case.

2017-11-09 23:17:52 +00:00

switch_create-custom-dl.ll

Adding a width of the GEP index to the Data Layout.

2018-02-14 06:58:08 +00:00

switch_create.ll

opt: Rename -default-data-layout flag to -data-layout and make it always override the layout.

2017-02-17 17:36:52 +00:00

switch_switch_fold.ll

use FileCheck for tighter checking

2016-03-16 23:39:37 +00:00

switch_thread.ll

reduce check strings; no need to check IR comments

2016-03-16 23:22:01 +00:00

switch_undef.ll

Bail out of a SimplifyCFG switch table opt at undef values.

2017-12-05 14:14:00 +00:00

switch-dead-default.ll

Revert @llvm.assume with operator bundles (r289755-r289757)

2016-12-19 08:22:17 +00:00

switch-masked-bits.ll

[SimplifyCFG] eliminate switch cases based on known range of switch condition

2016-05-20 14:53:09 +00:00

switch-on-const-select.ll

Mark @llvm.trap cold

2018-11-14 19:53:41 +00:00

switch-range-to-icmp.ll

SimplifyCFG: don't remove unreachable default switch destinations

2015-01-26 19:52:32 +00:00

switch-simplify-crash.ll

…

switch-to-br.ll

Add some tests for SimplifyCFG's ConstantFoldTerminator(). NFC.

2014-12-04 22:19:25 +00:00

switch-to-icmp.ll

…

switch-to-select-multiple-edge-per-block-phi.ll

[SimplifyCFG] auto-generate better checks; NFC

2016-11-25 21:12:39 +00:00

switch-to-select-two-case.ll

[SimplifyCFG] auto-generate better checks; NFC

2016-11-25 21:12:39 +00:00

trap-debugloc.ll

Revert "[SimplifyCFG] Stop inserting calls to llvm.trap for UB"

2016-06-25 08:19:55 +00:00

trap-no-null-opt-debugloc.ll

llvm: Add support for "-fno-delete-null-pointer-checks"

2018-07-09 22:27:23 +00:00

trapping-load-unreachable.ll

llvm: Add support for "-fno-delete-null-pointer-checks"

2018-07-09 22:27:23 +00:00

two-entry-phi-return.ll

[SimplifyCFG] propagate branch metadata when creating select (PR27344)

2016-04-15 15:32:12 +00:00

UncondBranchToHeader.ll

[SimplifyCFG] Re-apply Relax restriction for folding unconditional branches

2018-02-08 07:16:29 +00:00

UncondBranchToReturn.ll

…

unreachable-blocks.ll

[opaque pointer type] Add textual IR support for explicit type parameter to load instruction

2015-02-27 21:17:42 +00:00

unreachable-cleanuppad.ll

[SimplifyCFG] Do not blindly remove unreachable blocks

2016-02-24 10:02:16 +00:00

UnreachableEliminate.ll

llvm: Add support for "-fno-delete-null-pointer-checks"

2018-07-09 22:27:23 +00:00

volatile-phioper.ll

[opaque pointer type] Add textual IR support for explicit type parameter to the call instruction

2015-04-16 23:24:18 +00:00

wineh-unreachable.ll

[SimplifyCFG] Further improve our ability to remove redundant catchpads

2016-01-05 07:42:17 +00:00