[DebugInfo] Use variadic debug values to salvage BinOps and GEP instrs with non-const operands

[StephenTozer]

Summary

This patch follows the complete implementation of variadic debug values, making use of them to salvage arithmetic operations with two or more non-const operands; this includes the GetElementPtr instruction, and most Binary Operator instructions.

The majority of the real work in this patch is in Local.cpp, where the salvage function has been expanded in complexity for GEP and BinOp instructions, which have thus been refactored out into separate functions. The GEP implementation required the creation of a new function collectOffset which behaves similarly to accumulateConstantOffset, except that in addition to any constant offset it also fetches any non-constant offsets and returns them in a map of [SSA Value -> Factor].

Outside of these larger changes, the remainder of this patch consists of small utility functions used in salvaging, and updating uses of the salvage functions. Not all places that use salvaging have been updated to make use of variadic salvaging yet (such as salvaging in ISel), as additional changes need to be made in those areas to support this form of salvaging. They should not be difficult to implement in future, however.

[StephenTozer]

llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll

6

A note for reviewers on the changes made to this test: this test has been modified to prevent it failing after this patch is applied. The failure introduced by this patch is not an error, but the opposite: the test relies on intrinsics being made undef when the instruction they relied on is deleted, but as of this patch we are able to salvage them so they will not be set undef. In order to preserve the spirit of this test, I changed it to instead reassociate float arithmetic instructions, which cannot currently be salvaged and so results in the intrinsic being undef'd like before.

[dstenb]

Exciting!

I took the liberty to add some review comments whilst familiarizing myself with the code.

llvm/lib/IR/DebugInfoMetadata.cpp

1369

Nit: std::max(Result, ExprOp.getArg(0) + 1) ?

llvm/lib/Transforms/Utils/Local.cpp

1759–1760

Should this say DIExpression perhaps? DWARFv5 supports binary operations on base types wider than 64 bits, but LLVM does not support such expressions.

1872

Could the creation of this utility function and getSalvageOpsForBinOp be done as a preceding NFC refactoring commit? Just to make it slightly easier to see what the difference in behavior is.

[dblaikie]

(minor drive-by comment, but I'm not the right person to do more in depth review of this patch, unfortunately)

llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll

6

Any chance of using something that'd be even more robust by using, for instance, a call to an external 'pure' function where the return value is used to define the debug value, but is otherwise unused - there would the instruction could be deleted but there would be no way the value could be reconstituted no matter how much we improve debug info in the future

[djtodoro]

Thanks!! So, this should be the most important one :) I would really like to see some measurements (e.g. llvm-locstats) before/after this patch.
Have you tried building llvm-project itself with this?

[MaskRay]

(Neither arc patch D91722 nor curl -L 'https://reviews.llvm.org/D91722?download=1' | patch -p1 can apply the patch locally. Can you upload via arc diff or git format-patch?)

[aprantl]

This is nice!

llvm/lib/Transforms/Utils/Local.cpp

1790

Nit: Instead of having 20 calls to push_back, would it make sense to have a helper function that just does switch(opcode) { case Instruction::Add: return dwarf::DW_OP_plus; ...}?

[StephenTozer]

llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll

6

In a more general case I'd say so, but this behaviour in the reassociate pass is stimulated by arithmetic instructions, rather than just dead code in general; making use of float arithmetic in this case seemed to be the shortest path.

[StephenTozer]

In D91722#2404937, @djtodoro wrote:

Thanks!! So, this should be the most important one :) I would really like to see some measurements (e.g. llvm-locstats) before/after this patch.
Have you tried building llvm-project itself with this?

So far I've tested this with the benchmarks from the llvm test suite (specifically the CTMark projects, since we're looking for compilation metrics only). I'll post a more complete set of stats soon, but the summary is that there is a small increase in compile time for most projects; <1% or outright negligible in most cases. In terms of locstats, the change looks to add a modest 1-2% increase in overall variable coverage for most projects, although a notable exception is tramp3d-v4 which saw variable coverage change from 53%=>66% - a fairly substantial improvement.

I'm optimistic about further improvements to the locstats following from this work; the current patch doesn't update any of the existing salvaging in Instruction Selection to support variadic locations (they require some specific changes which aren't complicated but require a separate patch), and also enable some new salvaging opportunities in Instruction Selection and the loop passes (such as Loop Strength Reduce).

[StephenTozer]

Rebased onto recent master, no functional changes; moved the salvageDebugInfoImpl refactoring into a separate NFC patch; addressed outstanding review comments.

[aprantl]

llvm/include/llvm/IR/DebugInfoMetadata.h

2417

to be in line with the other method names: getNumLocationOperands() or getNumLocationRefs() or getNumArgOps()...?
If wee get super nerdy, I think technically these are operators (that operate on the DWARF stack) and not operands :-)

[StephenTozer]

llvm/include/llvm/IR/DebugInfoMetadata.h

2417

Sounds good to me! And wrt the nerdy point, I think that's actually an advantageous semantic point here: the intent of this function is actually to get the number of location operands that the DIExpression refers to, as opposed to the number of actual operators of a given type (i.e. for the nonsensical expression DIExpression(DW_OP_LLVM_arg 0, DW_OP_LLVM_arg 0, DW_OP_LLVM_arg 0) we still only refer to one location operand).

[djtodoro]

In D91722#2431127, @StephenTozer wrote:

In D91722#2404937, @djtodoro wrote:

Thanks!! So, this should be the most important one :) I would really like to see some measurements (e.g. llvm-locstats) before/after this patch.
Have you tried building llvm-project itself with this?

So far I've tested this with the benchmarks from the llvm test suite (specifically the CTMark projects, since we're looking for compilation metrics only). I'll post a more complete set of stats soon, but the summary is that there is a small increase in compile time for most projects; <1% or outright negligible in most cases. In terms of locstats, the change looks to add a modest 1-2% increase in overall variable coverage for most projects, although a notable exception is tramp3d-v4 which saw variable coverage change from 53%=>66% - a fairly substantial improvement.

I'm optimistic about further improvements to the locstats following from this work; the current patch doesn't update any of the existing salvaging in Instruction Selection to support variadic locations (they require some specific changes which aren't complicated but require a separate patch), and also enable some new salvaging opportunities in Instruction Selection and the loop passes (such as Loop Strength Reduce).

Very cool! Thanks!

[StephenTozer]

Rebased onto recent master, fixed test failures.

[StephenTozer]

Ping - any further comments?

[aprantl]

I think this looks pretty good. I found on last comment about the function signature of collectOffset, but otherwise this is fine.

llvm/include/llvm/IR/Instructions.h

1079

Any reason why this doesn't just return an Optional<APInt>?

[StephenTozer]

Rebased onto latest master.

Modified salvageDebugInfoForDbgValues to only produce DIArgLists for dbg.values, and not dbg.addr or dbg.declare. This is necessary for the time being, as the current implementation of variadic debug values only works with DW_OP_stack_value for reasons previously discussed on the mailing list and in the root patch of this stack. In the next patch to follow, which will make the current DBG_VALUE_LIST into the default debug value instruction, the DIExpression representation will be changed to support non-stack_value variadic debug values, and this change can be reverted.

[StephenTozer]

Minor update to fix an error in a comment (dbg.value -> dbg.declare).

[StephenTozer]

llvm/lib/Transforms/Utils/Local.cpp

67

This else block will be removed in the near future, so I've tried to minimize the amount of change to the function, rather than rewriting a greater portion around this.

[jmorse]

In D91722#2617949, @StephenTozer wrote:

Modified salvageDebugInfoForDbgValues to only produce DIArgLists for dbg.values, and not dbg.addr or dbg.declare. This is necessary for the time being, as the current implementation of variadic debug values only works with DW_OP_stack_value for reasons previously discussed on the mailing list and in the root patch of this stack. In the next patch to follow, which will make the current DBG_VALUE_LIST into the default debug value instruction, the DIExpression representation will be changed to support non-stack_value variadic debug values, and this change can be reverted.

SGTM

[StephenTozer]

Fixes two issues with handling of variadic debug values:

1. SelectionDAG::transferDebugValues incorrectly updating its dependencies list.
2. LoopStrengthReduce, when trying to "repair" undef debug values by replacing them with equal values, must first restore the original location metadata to prevent it from being incorrectly updated if the number of location operands changed as a result of salvaging by LSR.

[rupprecht]

I'm seeing a crash after the most recent time this was re-applied in 791930d74087b8ae8901172861a0fd21a211e436. The crash is when compiling https://github.com/beltoforion/muparser/blob/master/src/muParserTest.cpp, but I'm reducing it now, as the error might also depend on how we build that internally (we use at least`-g -O3`)

The assertion printed when crashing is:

assert.h assertion failed at llvm/lib/CodeGen/LiveDebugVariables.cpp:128 in (anonymous namespace)::DbgVariableValue::DbgVariableValue(ArrayRef<unsigned int>, bool, bool, const llvm::DIExpression &): LocNoVec.size() < 64 && "debug value containing 64+ unique machine locations is not " "supported by Live Debug Variables"

[rupprecht]

Here's a C++ repro

$ cat repro.cc
class h {
 public:
  h(const char *);
  ~h();
};

int j(h);
int k();

int func() {
  int l = k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  l += k();
  j("");
  return l;
}

$ clang++ -g -O1 -c repro.cc
clang++: /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:128: (anonymous namespace)::DbgVariableValue::DbgVariableValue(ArrayRef<unsigned int>, bool, bool, const llvm::DIExpression &): Assertion `LocNoVec.size() < 64 && "debug value containing 64+ unique machine locations is not " "supported by Live Debug Variables"' failed.
PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace, preprocessed source, and associated run script.
Stack dump:
0.      Program arguments: /home/rupprecht/dev/clang++ -g -O1 -c repro.cc
1.      <eof> parser at end of file
2.      Code generation
3.      Running pass 'Function Pass Manager' on module 'repro.cc'.
4.      Running pass 'Debug Variable Analysis' on function '@_Z4funcv'
...
#12 0x0000000008508a60 (anonymous namespace)::DbgVariableValue::DbgVariableValue(llvm::ArrayRef<unsigned int>, bool, bool, llvm::DIExpression const&) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:129:18
#13 0x0000000008505fff (anonymous namespace)::UserValue::addDef(llvm::SlotIndex, llvm::ArrayRef<llvm::MachineOperand>, bool, bool, llvm::DIExpression const&) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:403:22
#14 0x0000000008505976 (anonymous namespace)::LDVImpl::handleDebugValue(llvm::MachineInstr&, llvm::SlotIndex) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:814:5
#15 0x00000000085050d8 (anonymous namespace)::LDVImpl::collectDebugValues(llvm::MachineFunction&) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:887:68
#16 0x0000000008503983 (anonymous namespace)::LDVImpl::runOnMachineFunction(llvm::MachineFunction&) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:1208:18
#17 0x00000000085036f8 llvm::LiveDebugVariables::runOnMachineFunction(llvm::MachineFunction&) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/LiveDebugVariables.cpp:1236:3
#18 0x00000000081aced7 llvm::MachineFunctionPass::runOnFunction(llvm::Function&) /home/rupprecht/src/llvm-project/llvm/lib/CodeGen/MachineFunctionPass.cpp:72:8
#19 0x0000000008824f9e llvm::FPPassManager::runOnFunction(llvm::Function&) /home/rupprecht/src/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1439:23
#20 0x0000000008829cf2 llvm::FPPassManager::runOnModule(llvm::Module&) /home/rupprecht/src/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1485:16
#21 0x0000000008825889 (anonymous namespace)::MPPassManager::runOnModule(llvm::Module&) /home/rupprecht/src/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1554:23
...

[StephenTozer]

In D91722#2717356, @rupprecht wrote:

I'm seeing a crash after the most recent time this was re-applied in 791930d74087b8ae8901172861a0fd21a211e436. The crash is when compiling https://github.com/beltoforion/muparser/blob/master/src/muParserTest.cpp, but I'm reducing it now, as the error might also depend on how we build that internally (we use at least`-g -O3`)

Thanks for the report, and the handy reproducer! I'll upload a fix momentarily; it looks as though there's an extremely complex debug value being produced that tries to use more than 64 different return values. This hits a built-in limit on the number of allowed locations in LiveDebugVariables, added for performance reasons; we didn't expect to actually hit the capacity limit, but now that we know it's entirely possible to do so I'll either remove the assert and make sure the debug value is dropped instead, or expand the capacity limit. The latter would be preferred, but could cause performance issues with the current implementation of LiveDebugVariables; once I've determined whether or not anything will break from doing so, I'll push up the appropriate fix.

[StephenTozer]

In D91722#2717356, @rupprecht wrote:

I'm seeing a crash after the most recent time this was re-applied in 791930d74087b8ae8901172861a0fd21a211e436.

This issue should now be fixed as of revision rGb622df3c9398 - the build should be totally fixed, but let me know if any further errors appear relating to this.

[nathanchance]

This patch as 791930d74087b8ae8901172861a0fd21a211e436 causes assertion failures with several x86 Linux kernel configurations and a 32-bit ARM configuration:

$ curl -LSso .config https://github.com/archlinux/svntogit-packages/raw/packages/linux/trunk/config

$ make -skj"$(nproc)" LLVM=1 LLVM_IAS=1 olddefconfig arch/x86/events/intel/ds.o
clang-13: /home/nathan/cbl/github/tc-build/llvm-project/llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1105: llvm::SDValue::SDValue(llvm::SDNode *, unsigned int): Assertion `(!Node || !ResNo || ResNo < Node->getNumValues()) && "Invalid result number for the given node!"' failed.
PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace, preprocessed source, and associated run script.
Stack dump:
0.	Program arguments: /home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13 -cc1 -triple x86_64-unknown-linux-gnu -S -disable-free -main-file-name ds.c -mrelocation-model static -fno-delete-null-pointer-checks -mllvm -warn-stack-size=2048 -mframe-pointer=none -relaxed-aliasing -fmath-errno -fno-rounding-math -no-integrated-as -mconstructor-aliases -mcmodel=kernel -target-cpu x86-64 -target-feature +retpoline-indirect-calls -target-feature +retpoline-indirect-branches -target-feature -sse -target-feature -mmx -target-feature -sse2 -target-feature -3dnow -target-feature -avx -target-feature -x87 -target-feature +retpoline-external-thunk -disable-red-zone -tune-cpu generic -mllvm -treat-scalable-fixed-error-as-warning -debug-info-kind=limited -dwarf-version=4 -debugger-tuning=gdb -fcoverage-compilation-dir=/home/nathan/cbl/src/linux-stable -nostdsysteminc -nobuiltininc -resource-dir /home/nathan/cbl/github/tc-build/build/llvm/stage1/lib/clang/13.0.0 -dependency-file arch/x86/events/intel/.ds.o.d -MT arch/x86/events/intel/ds.o -isystem /home/nathan/cbl/github/tc-build/build/llvm/stage1/lib/clang/13.0.0/include -include ./include/linux/compiler-version.h -include ./include/linux/kconfig.h -include ./include/linux/compiler_types.h -I ./arch/x86/include -I ./arch/x86/include/generated -I ./include -I ./arch/x86/include/uapi -I ./arch/x86/include/generated/uapi -I ./include/uapi -I ./include/generated/uapi -D __KERNEL__ -D CC_USING_NOP_MCOUNT -D CC_USING_FENTRY -D KBUILD_MODFILE=\"arch/x86/events/intel/ds\" -D KBUILD_BASENAME=\"ds\" -D KBUILD_MODNAME=\"ds\" -D __KBUILD_MODNAME=kmod_ds -fmacro-prefix-map=./= -O2 -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs -Werror=implicit-function-declaration -Werror=implicit-int -Werror=return-type -Wno-format-security -Werror=unknown-warning-option -Wno-sign-compare -Wno-frame-address -Wno-address-of-packed-member -Wno-format-invalid-specifier -Wno-gnu -Wno-unused-const-variable -Wdeclaration-after-statement -Wvla -Wno-pointer-sign -Wno-array-bounds -Werror=date-time -Werror=incompatible-pointer-types -Wno-initializer-overrides -Wno-format -Wno-sign-compare -Wno-format-zero-length -Wno-pointer-to-enum-cast -Wno-tautological-constant-out-of-range-compare -std=gnu89 -fno-dwarf-directory-asm -fdebug-compilation-dir=/home/nathan/cbl/src/linux-stable -ferror-limit 19 -pg -mfentry -fwrapv -stack-protector 2 -mstack-alignment=8 -fcf-protection=none -fwchar-type=short -fno-signed-wchar -fgnuc-version=4.2.1 -fcolor-diagnostics -vectorize-loops -vectorize-slp -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o /tmp/ds-e46a9b.s -x c arch/x86/events/intel/ds.c
1.	<eof> parser at end of file
2.	Code generation
3.	Running pass 'Function Pass Manager' on module 'arch/x86/events/intel/ds.c'.
4.	Running pass 'X86 DAG->DAG Instruction Selection' on function '@intel_pmu_enable_bts'
 #0 0x00000000029dc9c3 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x29dc9c3)
 #1 0x00000000029da82e llvm::sys::RunSignalHandlers() (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x29da82e)
 #2 0x00000000029dce8a SignalHandler(int) Signals.cpp:0:0
 #3 0x00007ff60aaf2960 __restore_rt sigaction.c:0:0
 #4 0x00007ff60a5e4ef5 raise (/usr/lib/libc.so.6+0x3cef5)
 #5 0x00007ff60a5ce862 abort (/usr/lib/libc.so.6+0x26862)
 #6 0x00007ff60a5ce747 _nl_load_domain.cold loadmsgcat.c:0:0
 #7 0x00007ff60a5dd646 (/usr/lib/libc.so.6+0x35646)
 #8 0x000000000396d4eb ProcessSDDbgValues(llvm::SDNode*, llvm::SelectionDAG*, llvm::InstrEmitter&, llvm::SmallVectorImpl<std::pair<unsigned int, llvm::MachineInstr*> >&, llvm::DenseMap<llvm::SDValue, llvm::Register, llvm::DenseMapInfo<llvm::SDValue>, llvm::detail::DenseMapPair<llvm::SDValue, llvm::Register> >&, unsigned int) ScheduleDAGSDNodes.cpp:0:0
 #9 0x000000000396b8ce llvm::ScheduleDAGSDNodes::EmitSchedule(llvm::MachineInstrBundleIterator<llvm::MachineInstr, false>&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x396b8ce)
#10 0x000000000394b2ce llvm::SelectionDAGISel::CodeGenAndEmitDAG() (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x394b2ce)
#11 0x00000000039488c1 llvm::SelectionDAGISel::SelectAllBasicBlocks(llvm::Function const&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x39488c1)
#12 0x0000000003945151 llvm::SelectionDAGISel::runOnMachineFunction(llvm::MachineFunction&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x3945151)
#13 0x0000000001ab0f45 (anonymous namespace)::X86DAGToDAGISel::runOnMachineFunction(llvm::MachineFunction&) X86ISelDAGToDAG.cpp:0:0
#14 0x0000000001e814fd llvm::MachineFunctionPass::runOnFunction(llvm::Function&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x1e814fd)
#15 0x000000000231d188 llvm::FPPassManager::runOnFunction(llvm::Function&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x231d188)
#16 0x00000000023256d1 llvm::FPPassManager::runOnModule(llvm::Module&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x23256d1)
#17 0x000000000231dc51 llvm::legacy::PassManagerImpl::run(llvm::Module&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x231dc51)
#18 0x00000000030603f3 (anonymous namespace)::EmitAssemblyHelper::EmitAssemblyWithNewPassManager(clang::BackendAction, std::unique_ptr<llvm::raw_pwrite_stream, std::default_delete<llvm::raw_pwrite_stream> >) BackendUtil.cpp:0:0
#19 0x000000000305a49d clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, clang::BackendAction, std::unique_ptr<llvm::raw_pwrite_stream, std::default_delete<llvm::raw_pwrite_stream> >) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x305a49d)
#20 0x0000000003526e29 clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) CodeGenAction.cpp:0:0
#21 0x0000000003e4fcf4 clang::ParseAST(clang::Sema&, bool, bool) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x3e4fcf4)
#22 0x000000000347e200 clang::FrontendAction::Execute() (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x347e200)
#23 0x00000000033b82aa clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x33b82aa)
#24 0x0000000003520d48 clang::ExecuteCompilerInvocation(clang::CompilerInstance*) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x3520d48)
#25 0x00000000018577fc cc1_main(llvm::ArrayRef<char const*>, char const*, void*) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x18577fc)
#26 0x00000000018551bd ExecuteCC1Tool(llvm::SmallVectorImpl<char const*>&) driver.cpp:0:0
#27 0x0000000001854f15 main (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x1854f15)
#28 0x00007ff60a5cfb25 __libc_start_main (/usr/lib/libc.so.6+0x27b25)
#29 0x0000000001851e0e _start (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x1851e0e)
clang-13: error: unable to execute command: Aborted (core dumped)
clang-13: error: clang frontend command failed due to signal (use -v to see invocation)
ClangBuiltLinux clang version 13.0.0 (https://github.com/llvm/llvm-project 791930d74087b8ae8901172861a0fd21a211e436)
Target: x86_64-unknown-linux-gnu
Thread model: posix
InstalledDir: /home/nathan/cbl/github/tc-build/build/llvm/stage1/bin
clang-13: note: diagnostic msg: 
********************

PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:
Preprocessed source(s) and associated run script(s) are located at:
clang-13: note: diagnostic msg: /tmp/ds-6ee420.c
clang-13: note: diagnostic msg: /tmp/ds-6ee420.sh
clang-13: note: diagnostic msg: 

********************
make[4]: *** [scripts/Makefile.build:271: arch/x86/events/intel/ds.o] Error 254
make[4]: Target '__build' not remade because of errors.
make[3]: *** [scripts/Makefile.build:514: arch/x86/events/intel] Error 2
make[3]: Target '__build' not remade because of errors.
make[2]: *** [scripts/Makefile.build:514: arch/x86/events] Error 2
make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1851: arch/x86] Error 2
make[1]: Target 'arch/x86/events/intel/ds.o' not remade because of errors.
make: *** [Makefile:335: __build_one_by_one] Error 2
make: Target 'olddefconfig' not remade because of errors.
make: Target 'arch/x86/events/intel/ds.o' not remade because of errors.

$ make -skj"$(nproc)" ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- LLVM=1 distclean aspeed_g5_defconfig kernel/fork.o
clang-13: /home/nathan/cbl/github/tc-build/llvm-project/llvm/include/llvm/CodeGen/MachineRegisterInfo.h:830: void llvm::MachineRegisterInfo::updateDbgUsersToReg(llvm::Register, ArrayRef<llvm::MachineInstr *>) const: Assertion `MI->getOperand(0).isReg()' failed.
PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace, preprocessed source, and associated run script.
Stack dump:
0.	Program arguments: /home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13 -cc1 -triple armv6k-unknown-linux-gnueabi -S -disable-free -main-file-name fork.c -mrelocation-model static -meabi gnu -fno-delete-null-pointer-checks -mllvm -warn-stack-size=1024 -mframe-pointer=all -relaxed-aliasing -fmath-errno -fno-rounding-math -no-integrated-as -mconstructor-aliases -munwind-tables -target-cpu mpcore -target-feature +soft-float -target-feature +soft-float-abi -target-feature -vfp2 -target-feature -vfp2sp -target-feature -vfp3 -target-feature -vfp3d16 -target-feature -vfp3d16sp -target-feature -vfp3sp -target-feature -fp16 -target-feature -vfp4 -target-feature -vfp4d16 -target-feature -vfp4d16sp -target-feature -vfp4sp -target-feature -fp-armv8 -target-feature -fp-armv8d16 -target-feature -fp-armv8d16sp -target-feature -fp-armv8sp -target-feature -fullfp16 -target-feature -fp64 -target-feature -d32 -target-feature -neon -target-feature -crypto -target-feature -dotprod -target-feature -fp16fml -target-feature -bf16 -target-feature -mve -target-feature -mve.fp -target-feature -fpregs -target-feature +strict-align -target-abi aapcs-linux -msoft-float -mfloat-abi soft -mllvm -arm-global-merge=false -fallow-half-arguments-and-returns -mllvm -treat-scalable-fixed-error-as-warning -debug-info-kind=limited -dwarf-version=4 -debugger-tuning=gdb -fcoverage-compilation-dir=/home/nathan/cbl/src/linux-stable -nostdsysteminc -nobuiltininc -resource-dir /home/nathan/cbl/github/tc-build/build/llvm/stage1/lib/clang/13.0.0 -dependency-file kernel/.fork.o.d -MT kernel/fork.o -isystem /home/nathan/cbl/github/tc-build/build/llvm/stage1/lib/clang/13.0.0/include -include ./include/linux/compiler-version.h -include ./include/linux/kconfig.h -include ./include/linux/compiler_types.h -I ./arch/arm/include -I ./arch/arm/include/generated -I ./include -I ./arch/arm/include/uapi -I ./arch/arm/include/generated/uapi -I ./include/uapi -I ./include/generated/uapi -D __KERNEL__ -D __LINUX_ARM_ARCH__=6 -U arm -D KBUILD_MODFILE=\"kernel/fork\" -D KBUILD_BASENAME=\"fork\" -D KBUILD_MODNAME=\"fork\" -D __KBUILD_MODNAME=kmod_fork -fmacro-prefix-map=./= -O2 -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs -Werror=implicit-function-declaration -Werror=implicit-int -Werror=return-type -Wno-format-security -Werror=unknown-warning-option -Wno-frame-address -Wno-address-of-packed-member -Wno-format-invalid-specifier -Wno-gnu -Wno-unused-const-variable -Wdeclaration-after-statement -Wvla -Wno-pointer-sign -Wno-array-bounds -Werror=date-time -Werror=incompatible-pointer-types -Wno-initializer-overrides -Wno-format -Wno-sign-compare -Wno-format-zero-length -Wno-pointer-to-enum-cast -Wno-tautological-constant-out-of-range-compare -std=gnu89 -fno-dwarf-directory-asm -fdebug-compilation-dir=/home/nathan/cbl/src/linux-stable -ferror-limit 19 -pg -fwrapv -stack-protector 2 -fno-signed-char -fwchar-type=short -fno-signed-wchar -fgnuc-version=4.2.1 -fcolor-diagnostics -vectorize-loops -vectorize-slp -D__GCC_HAVE_DWARF2_CFI_ASM=1 -o /tmp/fork-960b24.s -x c kernel/fork.c
1.	<eof> parser at end of file
2.	Code generation
3.	Running pass 'Function Pass Manager' on module 'kernel/fork.c'.
4.	Running pass 'Machine Copy Propagation Pass' on function '@copy_init_mm'
 #0 0x0000000002e414c3 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x2e414c3)
 #1 0x0000000002e3f32e llvm::sys::RunSignalHandlers() (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x2e3f32e)
 #2 0x0000000002e4198a SignalHandler(int) Signals.cpp:0:0
 #3 0x00007f40920e8960 __restore_rt sigaction.c:0:0
 #4 0x00007f4091bdaef5 raise (/usr/lib/libc.so.6+0x3cef5)
 #5 0x00007f4091bc4862 abort (/usr/lib/libc.so.6+0x26862)
 #6 0x00007f4091bc4747 _nl_load_domain.cold loadmsgcat.c:0:0
 #7 0x00007f4091bd3646 (/usr/lib/libc.so.6+0x35646)
 #8 0x00000000024dbf26 (anonymous namespace)::MachineCopyPropagation::runOnMachineFunction(llvm::MachineFunction&) MachineCopyPropagation.cpp:0:0
 #9 0x0000000002300fdd llvm::MachineFunctionPass::runOnFunction(llvm::Function&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x2300fdd)
#10 0x0000000002780de8 llvm::FPPassManager::runOnFunction(llvm::Function&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x2780de8)
#11 0x0000000002789331 llvm::FPPassManager::runOnModule(llvm::Module&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x2789331)
#12 0x00000000027818b1 llvm::legacy::PassManagerImpl::run(llvm::Module&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x27818b1)
#13 0x00000000034c4dd3 (anonymous namespace)::EmitAssemblyHelper::EmitAssemblyWithNewPassManager(clang::BackendAction, std::unique_ptr<llvm::raw_pwrite_stream, std::default_delete<llvm::raw_pwrite_stream> >) BackendUtil.cpp:0:0
#14 0x00000000034bee7d clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, clang::BackendAction, std::unique_ptr<llvm::raw_pwrite_stream, std::default_delete<llvm::raw_pwrite_stream> >) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x34bee7d)
#15 0x000000000398b579 clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) CodeGenAction.cpp:0:0
#16 0x00000000042b47b4 clang::ParseAST(clang::Sema&, bool, bool) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x42b47b4)
#17 0x00000000038e2970 clang::FrontendAction::Execute() (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x38e2970)
#18 0x000000000381ca1a clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x381ca1a)
#19 0x0000000003985498 clang::ExecuteCompilerInvocation(clang::CompilerInstance*) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x3985498)
#20 0x0000000001ab19d5 cc1_main(llvm::ArrayRef<char const*>, char const*, void*) (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x1ab19d5)
#21 0x0000000001aaf37d ExecuteCC1Tool(llvm::SmallVectorImpl<char const*>&) driver.cpp:0:0
#22 0x0000000001aaf0d5 main (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x1aaf0d5)
#23 0x00007f4091bc5b25 __libc_start_main (/usr/lib/libc.so.6+0x27b25)
#24 0x0000000001aabfce _start (/home/nathan/cbl/github/tc-build/build/llvm/stage1/bin/clang-13+0x1aabfce)
clang-13: error: unable to execute command: Aborted (core dumped)
clang-13: error: clang frontend command failed due to signal (use -v to see invocation)
ClangBuiltLinux clang version 13.0.0 (https://github.com/llvm/llvm-project 791930d74087b8ae8901172861a0fd21a211e436)
Target: arm-unknown-linux-gnueabi
Thread model: posix
InstalledDir: /home/nathan/cbl/github/tc-build/build/llvm/stage1/bin
clang-13: note: diagnostic msg: 
********************

PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:
Preprocessed source(s) and associated run script(s) are located at:
clang-13: note: diagnostic msg: /tmp/fork-a2b208.c
clang-13: note: diagnostic msg: /tmp/fork-a2b208.sh
clang-13: note: diagnostic msg: 

********************
make[2]: *** [scripts/Makefile.build:271: kernel/fork.o] Error 254
make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1851: kernel] Error 2
make[1]: Target 'kernel/fork.o' not remade because of errors.
make: *** [Makefile:335: __build_one_by_one] Error 2
make: Target 'distclean' not remade because of errors.
make: Target 'aspeed_g5_defconfig' not remade because of errors.
make: Target 'kernel/fork.o' not remade because of errors.

A reduced reproducer for the first:

$ cat ds.i
intel_pmu_enable_bts_config, intel_pmu_enable_bts___trans_tmp_1,
    intel_pmu_enable_bts___ecx;
long intel_pmu_enable_bts___eax;
intel_pmu_enable_bts() {
  long debugctlmsr;
  intel_pmu_enable_bts___trans_tmp_1 = ({
    asm(""
        : "=c"(intel_pmu_enable_bts___ecx), "=a"(intel_pmu_enable_bts___eax));
    intel_pmu_enable_bts___eax;
  });
  debugctlmsr = intel_pmu_enable_bts___trans_tmp_1;
  debugctlmsr |= 6;
  if (intel_pmu_enable_bts_config)
    debugctlmsr |= 9;
  if (intel_pmu_enable_bts_config & 16)
    debugctlmsr |= 1;
  unsigned low = debugctlmsr;
  asm(".pushsection .discard.retpoline_safe\n\t"
      ".popsection\n"
      :
      : "S"(low));
}

$ clang -O2 -g -c -o /dev/null ds.i

A reduced reproducer for the second:

$ cat fork.i
typedef struct {
  int counter
} atomic_t;
enum { MM_SHMEMPAGES };
dup_mm_err;
atomic_long_read(atomic_t *v) { *(volatile *)v; }
struct mm_struct {
  struct {
    int binfmt
  };
} get_mm_counter(struct mm_struct *mm, int member) {
  atomic_long_read(&mm[member]);
}
dup_mm() {
  struct mm_struct *mm = kmem_cache_alloc(0);
  if (!mm)
    goto fail_nomem;
  if (dup_mm_err)
    goto free_pt;
  get_mm_counter(mm, MM_SHMEMPAGES);
  return mm;
free_pt:
  mm->binfmt = 0;
fail_nomem:
  return 0;
}

$ clang --target=arm-linux-gnueabi -march=armv6k -O2 -g -c -o /dev/null fork.i

The full preprocessed files are available here:

https://github.com/nathanchance/creduce-files/tree/fcef93c38903db773a8a46840b5e7b43a4444e85/791930d74087b8ae8901172861a0fd21a211e436-arm

https://github.com/nathanchance/creduce-files/tree/fcef93c38903db773a8a46840b5e7b43a4444e85/791930d74087b8ae8901172861a0fd21a211e436-x86

[StephenTozer]

Thanks for the report @nathanchance, I'm putting together a fix now. The first error looks to be quite straightforward (the error is contained to a single small function), and I'm currently investigating the latter - if it seems sufficiently complicated I'll revert pending a fix, otherwise I'll submit a fix today and get it merged in shortly afterwards.

[StephenTozer]

Fixes are up for review at D101523 and D101540; both fixes are quite small and so shouldn't be held up too long in review, but if the fix is needed urgently you can either apply those patches directly while awaiting their arrival in the main branch, or they can potentially be commited prior to finishing review - this isn't preferred, but is an option for sufficiently simple changes.

[nickdesaulniers]

@StephenTozer what's the status of the two fixes? Can you chase those please? You shouldn't be leaving breaking changes in for >24hrs please.

[nickdesaulniers]

Bumping; I just hit this again trying to debug an unrelated case: https://github.com/ClangBuiltLinux/linux/issues/1365#issuecomment-830388033. If this can't be fixed forward by EOD, I'm reverting it so we don't go into the weekend with this.

[nickdesaulniers]

Reverted in https://reviews.llvm.org/rGb11e4c990771541e440861f017afea7b4ba162f4 as per https://llvm.org/docs/DeveloperPolicy.html#patch-reversion-policy. I apologize for extra effort and delays in this feature that causes, but we are more than willing to go out of our way to help you test a revised version of this patch. Perhaps it would be appropriate at this point to squash D101523 and D101540 into this?

[nathanchance]

b11e4c990771541e440861f017afea7b4ba162f4 only reverted D101373, which was a follow-up fix to this one. I reverted this patch in 4397b7095d640f9b9426c4d0135e999c5a1de1c5.

So this patch should be recommitted with D101373, D101523, and D101540 squashed in it seems. I am free to test a new revision against the kernel on Monday.

[StephenTozer]

In D91722#2729950, @nickdesaulniers wrote:

@StephenTozer what's the status of the two fixes? Can you chase those please? You shouldn't be leaving breaking changes in for >24hrs please.

Apologies for not reverting sooner and leaving you to take care of it; the fixes are still under review, when they complete I'll reapply the whole stack.

[sbc100]

After the third re-land of this patch we are seeing a crash in the emscripten compiler: https://logs.chromium.org/logs/emscripten-releases/buildbucket/cr-buildbucket.appspot.com/8846604336499720256/+/steps/Emscripten_testsuite__upstream__other_/0/stdout

cache:INFO: generating system library: sysroot/lib/wasm32-emscripten/libbullet.a... (this will be cached in "/b/s/w/ir/k/install/emscripten/cache/sysroot/lib/wasm32-emscripten/libbullet.a" for subsequent builds)
root:INFO: building port: bullet
['--bind', '-O2', '-s', 'EMBIND_STD_STRING_IS_UTF8=0']
clang++: /b/s/w/ir/cache/builder/emscripten-releases/llvm-project/llvm/lib/Target/WebAssembly/WebAssemblyExplicitLocals.cpp:423: virtual bool (anonymous namespace)::WebAssemblyExplicitLocals::runOnMachineFunction(llvm::MachineFunction &): Assertion `(!MO.isReg() || MRI.use_empty(MO.getReg()) || MFI.isVRegStackified(MO.getReg())) && "WebAssemblyExplicitLocals failed to stackify a register operand"' failed.
PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace, preprocessed source, and associated run script.
Stack dump:
0.	Program arguments: /b/s/w/ir/k/install/bin/clang++ -target wasm32-unknown-emscripten -DEMSCRIPTEN -fignore-exceptions -mllvm -combiner-global-alias-analysis=false -mllvm -enable-emscripten-sjlj -mllvm -disable-lsr -D__EMSCRIPTEN_major__=2 -D__EMSCRIPTEN_minor__=0 -D__EMSCRIPTEN_tiny__=22 -D_LIBCPP_ABI_VERSION=2 -Dunix -D__unix -D__unix__ -Werror=implicit-function-declaration -Xclang -iwithsysroot/include/SDL --sysroot=/b/s/w/ir/k/install/emscripten/cache/sysroot -Xclang -iwithsysroot/include/compat -g -c -O2 -w -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/vectormath/scalar -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/vectormath/sse -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletCollision/CollisionShapes -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletCollision/NarrowPhaseCollision -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletCollision/BroadphaseCollision -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletCollision/Gimpact -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletCollision/CollisionDispatch -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/Dynamics -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/Vehicle -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/Character -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/MLCPSolvers -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/Featherstone -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/ConstraintSolver -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/MiniCL/MiniCLTask -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/vectormath -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletCollision -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/LinearMath -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletSoftBody -I/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/MiniCL /b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp -o /b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp.o
1.	<eof> parser at end of file
2.	Code generation
3.	Running pass 'Function Pass Manager' on module '/b/s/w/ir/k/install/emscripten/cache/ports-builds/bullet/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp'.
4.	Running pass 'WebAssembly Explicit Locals' on function '@_ZN35btSequentialImpulseConstraintSolver28solveGroupCacheFriendlySetupEPP17btCollisionObjectiPP20btPersistentManifoldiPP17btTypedConstraintiRK19btContactSolverInfoP12btIDebugDraw'
 #0 0x00007f98e689efa3 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x18d1fa3)
 #1 0x00007f98e689cd9e llvm::sys::RunSignalHandlers() (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x18cfd9e)
 #2 0x00007f98e689e31d llvm::sys::CleanupOnSignal(unsigned long) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x18d131d)
 #3 0x00007f98e67d22d3 (anonymous namespace)::CrashRecoveryContextImpl::HandleCrash(int, unsigned long) CrashRecoveryContext.cpp:0:0
 #4 0x00007f98e67d243e CrashRecoverySignalHandler(int) CrashRecoveryContext.cpp:0:0
 #5 0x00007f98e4dc0980 __restore_rt (/lib/x86_64-linux-gnu/libpthread.so.0+0x12980)
 #6 0x00007f98e0a02fb7 raise (/lib/x86_64-linux-gnu/libc.so.6+0x3efb7)
 #7 0x00007f98e0a04921 abort (/lib/x86_64-linux-gnu/libc.so.6+0x40921)
 #8 0x00007f98e09f448a (/lib/x86_64-linux-gnu/libc.so.6+0x3048a)
 #9 0x00007f98e09f4502 (/lib/x86_64-linux-gnu/libc.so.6+0x30502)
#10 0x00007f98e892bb50 (anonymous namespace)::WebAssemblyExplicitLocals::runOnMachineFunction(llvm::MachineFunction&) WebAssemblyExplicitLocals.cpp:0:0
#11 0x00007f98e6cc5ced llvm::MachineFunctionPass::runOnFunction(llvm::Function&) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x1cf8ced)
#12 0x00007f98e6a194b8 llvm::FPPassManager::runOnFunction(llvm::Function&) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x1a4c4b8)
#13 0x00007f98e6a21941 llvm::FPPassManager::runOnModule(llvm::Module&) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x1a54941)
#14 0x00007f98e6a19fcb llvm::legacy::PassManagerImpl::run(llvm::Module&) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x1a4cfcb)
#15 0x00007f98e39cf5b6 (anonymous namespace)::EmitAssemblyHelper::EmitAssemblyWithNewPassManager(clang::BackendAction, std::unique_ptr<llvm::raw_pwrite_stream, std::default_delete<llvm::raw_pwrite_stream> >) BackendUtil.cpp:0:0
#16 0x00007f98e39c9d33 clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::StringRef, llvm::Module*, clang::BackendAction, std::unique_ptr<llvm::raw_pwrite_stream, std::default_delete<llvm::raw_pwrite_stream> >) (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x265ed33)
#17 0x00007f98e3cf3e80 clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) CodeGenAction.cpp:0:0
#18 0x00007f98e29e46e4 clang::ParseAST(clang::Sema&, bool, bool) (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x16796e4)
#19 0x00007f98e42e9220 clang::FrontendAction::Execute() (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2f7e220)
#20 0x00007f98e425fe7f clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2ef4e7f)
#21 0x00007f98e436821c clang::ExecuteCompilerInvocation(clang::CompilerInstance*) (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2ffd21c)
#22 0x00000000002145b2 cc1_main(llvm::ArrayRef<char const*>, char const*, void*) (/b/s/w/ir/k/install/bin/clang+++0x2145b2)
#23 0x000000000021213d ExecuteCC1Tool(llvm::SmallVectorImpl<char const*>&) driver.cpp:0:0
#24 0x00007f98e3f37ca2 void llvm::function_ref<void ()>::callback_fn<clang::driver::CC1Command::Execute(llvm::ArrayRef<llvm::Optional<llvm::StringRef> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, bool*) const::$_1>(long) Job.cpp:0:0
#25 0x00007f98e67d21e7 llvm::CrashRecoveryContext::RunSafely(llvm::function_ref<void ()>) (/b/s/w/ir/k/install/bin/../lib/libLLVM-13git.so+0x18051e7)
#26 0x00007f98e3f377f7 clang::driver::CC1Command::Execute(llvm::ArrayRef<llvm::Optional<llvm::StringRef> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, bool*) const (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2bcc7f7)
#27 0x00007f98e3f02ce8 clang::driver::Compilation::ExecuteCommand(clang::driver::Command const&, clang::driver::Command const*&) const (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2b97ce8)
#28 0x00007f98e3f02fb7 clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, llvm::SmallVectorImpl<std::pair<int, clang::driver::Command const*> >&) const (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2b97fb7)
#29 0x00007f98e3f1d091 clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, llvm::SmallVectorImpl<std::pair<int, clang::driver::Command const*> >&) (/b/s/w/ir/k/install/bin/../lib/libclang-cpp.so.13git+0x2bb2091)
#30 0x0000000000211a06 main (/b/s/w/ir/k/install/bin/clang+++0x211a06)
#31 0x00007f98e09e5bf7 __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21bf7)
#32 0x000000000020ed6a _start (/b/s/w/ir/k/install/bin/clang+++0x20ed6a)
clang-13: error: clang frontend command failed with exit code 134 (use -v to see invocation)
clang version 13.0.0 (/b/s/w/ir/cache/git/chromium.googlesource.com-external-github.com-llvm-llvm--project 95612afc1d69ff470943b10210bb902fa14fc4e8)
Target: wasm32-unknown-emscripten
Thread model: posix
InstalledDir: /b/s/w/ir/k/install/bin
clang-13: note: diagnostic msg: 
********************

PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:
Preprocessed source(s) and associated run script(s) are located at:
clang-13: note: diagnostic msg: /b/s/w/ir/tmp/t/btSequentialImpulseConstraintSolver-d507ac.cpp
clang-13: note: diagnostic msg: /b/s/w/ir/tmp/t/btSequentialImpulseConstraintSolver-d507ac.sh
clang-13: note: diagnostic msg: 

********************

I went back and testing this with the intial landing, and with the 1st and 2nd re-landing and none of those broke us.. Only the 3rd re-landing.

[jmorse]

In D91722#2774557, @sbc100 wrote:

After the third re-land of this patch we are seeing a crash in the emscripten compiler: https://logs.chromium.org/logs/emscripten-releases/buildbucket/cr-buildbucket.appspot.com/8846604336499720256/+/steps/Emscripten_testsuite__upstream__other_/0/stdout

Thanks for the report -- we're out of working hours in the UK timezone and I can't revert myself, if you could revert this for us, please do.

[sbc100]

In D91722#2774612, @jmorse wrote:

In D91722#2774557, @sbc100 wrote:

After the third re-land of this patch we are seeing a crash in the emscripten compiler: https://logs.chromium.org/logs/emscripten-releases/buildbucket/cr-buildbucket.appspot.com/8846604336499720256/+/steps/Emscripten_testsuite__upstream__other_/0/stdout

Thanks for the report -- we're out of working hours in the UK timezone and I can't revert myself, if you could revert this for us, please do.

We are investigating now. I looks like this assert only fires in combination with WebAssemlby change that was landed between the 2nd and 3rd re-landing: https://reviews.llvm.org/D102589. I think we will try to fix forward if we can and if that fails revert either or the other.

[wenlei]

We're seeing a pathological case with 36ec97f76ac0d8be76fb16ac521f55126766267d (3rd Reapply "[DebugInfo] Use variadic debug values to salvage BinOps and GEP instrs with non-const operands).

Compilation of certain cpp file slowed down from ~17s to 10+ hours. It seems stuck in inliner but actually it's spending huge amount of time trying to replace all uses of function call with the return value for each inlined call. This is because the calls are being used in 10K+ of DIArgList metadata. And for each DIArgList, we need to go through each Arg in order to replace any occurrence of the old value, and in this case, we often have hundreds of Arg for each DIArgList. All of that is then multiplied by hundreds of inline site ...

Those huge DIArgList starts to appear after InstrCombine. I haven't tried to verify whether the generated DIArgList and the debug intrinsic is legit, but wondering if this is potentially a known issue? This is affecting builds for several of our large workloads.

Example of a problematic, huge DIArgList, and we have many of those:

call void @llvm.dbg.value(metadata !DIArgList(i64 %256, i64 %2379, i64 %2375, i64 %2371, i64 %2367, i64 %2363, i64 %2358, i64 %2350, i64 %2346, i64 %2342, i64 %2338, i64 %2334, i64 %2330, i64 %2326, i64 %2322, i64 %2318, i64 %2314, i64 %2310, i64 %2305, i64 %2296, i64 %2287, i64 %2279, i64 %2275, i64 %2271, i64 %2267, i64 %2263, i64 %2259, i64 %2254, i64 %2245, i64 %2231, i64 %2218, i64 %2214, i64 %2210, i64 %2205, i64 %2196, i64 %2187, i64 %2179, i64 %2174, i64 %2165, i64 %2157, i64 %2152, i64 %2138, i64 %2125, i64 %2121, i64 %2116, i64 %2108, i64 %2104, i64 %2100, i64 %2096, i64 %2092, i64 %2088, i64 %2084, i64 %2080, i64 %2076, i64 %2072, i64 %2067, i64 %2059, i64 %2055, i64 %2050, i64 %2037, i64 %2033, i64 %2029, i64 %2025, i64 %2021, i64 %2016, i64 %2003, i64 %1998, i64 %1989, i64 %1976, i64 %1972, i64 %1968, i64 %1964, i64 %1960, i64 %1956, i64 %1952, i64 %1948, i64 %1944, i64 %1940, i64 %1935, i64 %1921, i64 %1907, i64 %1899, i64 %1895, i64 %1891, i64 %1887, i64 %1883, i64 %1879, i64 %1875, i64 %1871, i64 %1866, i64 %1853, i64 %1849, i64 %1845, i64 %1841, i64 %1837, i64 %1833, i64 %1829, i64 %1825, i64 %1821, i64 %1816, i64 %1802, i64 %1789, i64 %1785, i64 %1781, i64 %1776, i64 %1763, i64 %1759, i64 %1755, i64 %1751, i64 %1746, i64 %1737, i64 %1728, i64 %1719, i64 %1706, i64 %1701, i64 %1693, i64 %1688, i64 %1676, i64 %1672, i64 %1668, i64 %1664, i64 %1660, i64 %1656, i64 %1652, i64 %1647, i64 %1633, i64 %1620, i64 %1615, i64 %1607, i64 %1603, i64 %1599, i64 %1595, i64 %1591, i64 %1587, i64 %1583, i64 %1579, i64 %1575, i64 %1571, i64 %1566, i64 %1553, i64 %1549, i64 %1545, i64 %1541, i64 %1537, i64 %1532, i64 %1519, i64 %1515, i64 %1511, i64 %1507, i64 %1503, i64 %1498, i64 %1484, i64 %1475, i64 %1462, i64 %1458, i64 %1454, i64 %1450, i64 %1446, i64 %1442, i64 %1438, i64 %1434, i64 %1429, i64 %1416, i64 %1412, i64 %1408, i64 %1404, i64 %1400, i64 %1396, i64 %1392, i64 %1388, i64 %1383, i64 %1374, i64 %1365, i64 %1352, i64 %1348, i64 %1344, i64 %1340, i64 %1336, i64 %1332, i64 %1328, i64 %1324, i64 %1320, i64 %1316, i64 %1311, i64 %1298, i64 %1294, i64 %1290, i64 %1286, i64 %1282, i64 %1278, i64 %1274, i64 %1270, i64 %1266, i64 %1262, i64 %1258, i64 %1253, i64 %1240, i64 %1235, i64 %1226, i64 %1218, i64 %1213, i64 %1205, i64 %1201, i64 %1197, i64 %1193, i64 %1189, i64 %1185, i64 %1181, i64 %1177, i64 %1172, i64 %1163, i64 %1150, i64 %1146, i64 %1142, i64 %1138, i64 %1134, i64 %1130, i64 %1125, i64 %1111, i64 %1098, i64 %1094, i64 %1090, i64 %1086, i64 %1081, i64 %1068, i64 %1064, i64 %1060, i64 %1055, i64 %1046, i64 %1038, i64 %1034, i64 %1029, i64 %1021, i64 %1017, i64 %1012, i64 %999, i64 %990, i64 %982, i64 %978, i64 %973, i64 %959, i64 %947, i64 %942, i64 %934, i64 %930, i64 %925, i64 %916, i64 %908, i64 %904, i64 %899, i64 %882, i64 %877, i64 %869, i64 %865, i64 %860, i64 %852, i64 %847, i64 %838, i64 %826, i64 %822, i64 %818, i64 %813, i64 %800, i64 %796, i64 %792, i64 %787, i64 %778, i64 %766, i64 %762, i64 %758, i64 %754, i64 %749, i64 %736, i64 %724, i64 %719, i64 %707, i64 %703, i64 %698, i64 %684, i64 %672, i64 %667, i64 %654, i64 %649, i64 %636, i64 %632, i64 %628, i64 %623, i64 %610, i64 %606, i64 %602, i64 %597, i64 %589, i64 %585, i64 %580, i64 %562, i64 %544, i64 %535, i64 %521, i64 %513, i64 %509, i64 %505, i64 %500, i64 %487, i64 %482, i64 %474, i64 %470, i64 %466, i64 %462, i64 %458, i64 %454, i64 %450, i64 %446, i64 %442, i64 %438, i64 %433, i64 %420, i64 %415, i64 %406, i64 %398, i64 %394, i64 %390, i64 %386, i64 %382, i64 %378, i64 %373, i64 %360, i64 %356, i64 %351, i64 %338, i64 %333, i64 %320, i64 %316, i64 %312, i64 %308, i64 %304, i64 %300, i64 %296, i64 %292, i64 %288, i64 %284, i64 %280, i64 %276, i64 %272, i64 %268, i64 %264, i64 %260), metadata !135223, metadata !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 345, DW_OP_plus, DW_OP_LLVM_arg, 344, DW_OP_plus, DW_OP_LLVM_arg, 343, DW_OP_plus, DW_OP_LLVM_arg, 342, DW_OP_plus, DW_OP_LLVM_arg, 341, DW_OP_plus, DW_OP_LLVM_arg, 340, DW_OP_plus, DW_OP_LLVM_arg, 339, DW_OP_plus, DW_OP_LLVM_arg, 338, DW_OP_plus, DW_OP_LLVM_arg, 337, DW_OP_plus, DW_OP_LLVM_arg, 336, DW_OP_plus, DW_OP_LLVM_arg, 335, DW_OP_plus, DW_OP_LLVM_arg, 334, DW_OP_plus, DW_OP_LLVM_arg, 333, DW_OP_plus, DW_OP_LLVM_arg, 332, DW_OP_plus, DW_OP_LLVM_arg, 331, DW_OP_plus, DW_OP_LLVM_arg, 330, DW_OP_plus, DW_OP_LLVM_arg, 329, DW_OP_plus, DW_OP_LLVM_arg, 328, DW_OP_plus, DW_OP_LLVM_arg, 327, DW_OP_plus, DW_OP_LLVM_arg, 326, DW_OP_plus, DW_OP_LLVM_arg, 325, DW_OP_plus, DW_OP_LLVM_arg, 324, DW_OP_plus, DW_OP_LLVM_arg, 323, DW_OP_plus, DW_OP_LLVM_arg, 322, DW_OP_plus, DW_OP_LLVM_arg, 321, DW_OP_plus, DW_OP_LLVM_arg, 320, DW_OP_plus, DW_OP_LLVM_arg, 319, DW_OP_plus, DW_OP_LLVM_arg, 318, DW_OP_plus, DW_OP_LLVM_arg, 317, DW_OP_plus, DW_OP_LLVM_arg, 316, DW_OP_plus, DW_OP_LLVM_arg, 315, DW_OP_plus, DW_OP_LLVM_arg, 314, DW_OP_plus, DW_OP_LLVM_arg, 313, DW_OP_plus, DW_OP_LLVM_arg, 312, DW_OP_plus, DW_OP_LLVM_arg, 311, DW_OP_plus, DW_OP_LLVM_arg, 310, DW_OP_plus, DW_OP_LLVM_arg, 309, DW_OP_plus, DW_OP_LLVM_arg, 308, DW_OP_plus, DW_OP_LLVM_arg, 307, DW_OP_plus, DW_OP_LLVM_arg, 306, DW_OP_plus, DW_OP_LLVM_arg, 305, DW_OP_plus, DW_OP_LLVM_arg, 304, DW_OP_plus, DW_OP_LLVM_arg, 303, DW_OP_plus, DW_OP_LLVM_arg, 302, DW_OP_plus, DW_OP_LLVM_arg, 301, DW_OP_plus, DW_OP_LLVM_arg, 300, DW_OP_plus, DW_OP_LLVM_arg, 299, DW_OP_plus, DW_OP_LLVM_arg, 298, DW_OP_plus, DW_OP_LLVM_arg, 297, DW_OP_plus, DW_OP_LLVM_arg, 296, DW_OP_plus, DW_OP_LLVM_arg, 295, DW_OP_plus, DW_OP_LLVM_arg, 294, DW_OP_plus, DW_OP_LLVM_arg, 293, DW_OP_plus, DW_OP_LLVM_arg, 292, DW_OP_plus, DW_OP_LLVM_arg, 291, DW_OP_plus, DW_OP_LLVM_arg, 290, DW_OP_plus, DW_OP_LLVM_arg, 289, DW_OP_plus, DW_OP_LLVM_arg, 288, DW_OP_plus, DW_OP_LLVM_arg, 287, DW_OP_plus, DW_OP_LLVM_arg, 286, DW_OP_plus, DW_OP_LLVM_arg, 285, DW_OP_plus, DW_OP_LLVM_arg, 284, DW_OP_plus, DW_OP_LLVM_arg, 283, DW_OP_plus, DW_OP_LLVM_arg, 282, DW_OP_plus, DW_OP_LLVM_arg, 281, DW_OP_plus, DW_OP_LLVM_arg, 280, DW_OP_plus, DW_OP_LLVM_arg, 279, DW_OP_plus, DW_OP_LLVM_arg, 278, DW_OP_plus, DW_OP_LLVM_arg, 277, DW_OP_plus, DW_OP_LLVM_arg, 276, DW_OP_plus, DW_OP_LLVM_arg, 275, DW_OP_plus, DW_OP_LLVM_arg, 274, DW_OP_plus, DW_OP_LLVM_arg, 273, DW_OP_plus, DW_OP_LLVM_arg, 272, DW_OP_plus, DW_OP_LLVM_arg, 271, DW_OP_plus, DW_OP_LLVM_arg, 270, DW_OP_plus, DW_OP_LLVM_arg, 269, DW_OP_plus, DW_OP_LLVM_arg, 268, DW_OP_plus, DW_OP_LLVM_arg, 267, DW_OP_plus, DW_OP_LLVM_arg, 266, DW_OP_plus, DW_OP_LLVM_arg, 265, DW_OP_plus, DW_OP_LLVM_arg, 264, DW_OP_plus, DW_OP_LLVM_arg, 263, DW_OP_plus, DW_OP_LLVM_arg, 262, DW_OP_plus, DW_OP_LLVM_arg, 261, DW_OP_plus, DW_OP_LLVM_arg, 260, DW_OP_plus, DW_OP_LLVM_arg, 259, DW_OP_plus, DW_OP_LLVM_arg, 258, DW_OP_plus, DW_OP_LLVM_arg, 257, DW_OP_plus, DW_OP_LLVM_arg, 256, DW_OP_plus, DW_OP_LLVM_arg, 255, DW_OP_plus, DW_OP_LLVM_arg, 254, DW_OP_plus, DW_OP_LLVM_arg, 253, DW_OP_plus, DW_OP_LLVM_arg, 252, DW_OP_plus, DW_OP_LLVM_arg, 251, DW_OP_plus, DW_OP_LLVM_arg, 250, DW_OP_plus, DW_OP_LLVM_arg, 249, DW_OP_plus, DW_OP_LLVM_arg, 248, DW_OP_plus, DW_OP_LLVM_arg, 247, DW_OP_plus, DW_OP_LLVM_arg, 246, DW_OP_plus, DW_OP_LLVM_arg, 245, DW_OP_plus, DW_OP_LLVM_arg, 244, DW_OP_plus, DW_OP_LLVM_arg, 243, DW_OP_plus, DW_OP_LLVM_arg, 242, DW_OP_plus, DW_OP_LLVM_arg, 241, DW_OP_plus, DW_OP_LLVM_arg, 240, DW_OP_plus, DW_OP_LLVM_arg, 239, DW_OP_plus, DW_OP_LLVM_arg, 238, DW_OP_plus, DW_OP_LLVM_arg, 237, DW_OP_plus, DW_OP_LLVM_arg, 236, DW_OP_plus, DW_OP_LLVM_arg, 235, DW_OP_plus, DW_OP_LLVM_arg, 234, DW_OP_plus, DW_OP_LLVM_arg, 233, DW_OP_plus, DW_OP_LLVM_arg, 232, DW_OP_plus, DW_OP_LLVM_arg, 231, DW_OP_plus, DW_OP_LLVM_arg, 230, DW_OP_plus, DW_OP_LLVM_arg, 229, DW_OP_plus, DW_OP_LLVM_arg, 228, DW_OP_plus, DW_OP_LLVM_arg, 227, DW_OP_plus, DW_OP_LLVM_arg, 226, DW_OP_plus, DW_OP_LLVM_arg, 225, DW_OP_plus, DW_OP_LLVM_arg, 224, DW_OP_plus, DW_OP_LLVM_arg, 223, DW_OP_plus, DW_OP_LLVM_arg, 222, DW_OP_plus, DW_OP_LLVM_arg, 221, DW_OP_plus, DW_OP_LLVM_arg, 220, DW_OP_plus, DW_OP_LLVM_arg, 219, DW_OP_plus, DW_OP_LLVM_arg, 218, DW_OP_plus, DW_OP_LLVM_arg, 217, DW_OP_plus, DW_OP_LLVM_arg, 216, DW_OP_plus, DW_OP_LLVM_arg, 215, DW_OP_plus, DW_OP_LLVM_arg, 214, DW_OP_plus, DW_OP_LLVM_arg, 213, DW_OP_plus, DW_OP_LLVM_arg, 212, DW_OP_plus, DW_OP_LLVM_arg, 211, DW_OP_plus, DW_OP_LLVM_arg, 210, DW_OP_plus, DW_OP_LLVM_arg, 209, DW_OP_plus, DW_OP_LLVM_arg, 208, DW_OP_plus, DW_OP_LLVM_arg, 207, DW_OP_plus, DW_OP_LLVM_arg, 206, DW_OP_plus, DW_OP_LLVM_arg, 205, DW_OP_plus, DW_OP_LLVM_arg, 204, DW_OP_plus, DW_OP_LLVM_arg, 203, DW_OP_plus, DW_OP_LLVM_arg, 202, DW_OP_plus, DW_OP_LLVM_arg, 201, DW_OP_plus, DW_OP_LLVM_arg, 200, DW_OP_plus, DW_OP_LLVM_arg, 199, DW_OP_plus, DW_OP_LLVM_arg, 198, DW_OP_plus, DW_OP_LLVM_arg, 197, DW_OP_plus, DW_OP_LLVM_arg, 196, DW_OP_plus, DW_OP_LLVM_arg, 195, DW_OP_plus, DW_OP_LLVM_arg, 194, DW_OP_plus, DW_OP_LLVM_arg, 193, DW_OP_plus, DW_OP_LLVM_arg, 192, DW_OP_plus, DW_OP_LLVM_arg, 191, DW_OP_plus, DW_OP_LLVM_arg, 190, DW_OP_plus, DW_OP_LLVM_arg, 189, DW_OP_plus, DW_OP_LLVM_arg, 188, DW_OP_plus, DW_OP_LLVM_arg, 187, DW_OP_plus, DW_OP_LLVM_arg, 186, DW_OP_plus, DW_OP_LLVM_arg, 185, DW_OP_plus, DW_OP_LLVM_arg, 184, DW_OP_plus, DW_OP_LLVM_arg, 183, DW_OP_plus, DW_OP_LLVM_arg, 182, DW_OP_plus, DW_OP_LLVM_arg, 181, DW_OP_plus, DW_OP_LLVM_arg, 180, DW_OP_plus, DW_OP_LLVM_arg, 179, DW_OP_plus, DW_OP_LLVM_arg, 178, DW_OP_plus, DW_OP_LLVM_arg, 177, DW_OP_plus, DW_OP_LLVM_arg, 176, DW_OP_plus, DW_OP_LLVM_arg, 175, DW_OP_plus, DW_OP_LLVM_arg, 174, DW_OP_plus, DW_OP_LLVM_arg, 173, DW_OP_plus, DW_OP_LLVM_arg, 172, DW_OP_plus, DW_OP_LLVM_arg, 171, DW_OP_plus, DW_OP_LLVM_arg, 170, DW_OP_plus, DW_OP_LLVM_arg, 169, DW_OP_plus, DW_OP_LLVM_arg, 168, DW_OP_plus, DW_OP_LLVM_arg, 167, DW_OP_plus, DW_OP_LLVM_arg, 166, DW_OP_plus, DW_OP_LLVM_arg, 165, DW_OP_plus, DW_OP_LLVM_arg, 164, DW_OP_plus, DW_OP_LLVM_arg, 163, DW_OP_plus, DW_OP_LLVM_arg, 162, DW_OP_plus, DW_OP_LLVM_arg, 161, DW_OP_plus, DW_OP_LLVM_arg, 160, DW_OP_plus, DW_OP_LLVM_arg, 159, DW_OP_plus, DW_OP_LLVM_arg, 158, DW_OP_plus, DW_OP_LLVM_arg, 157, DW_OP_plus, DW_OP_LLVM_arg, 156, DW_OP_plus, DW_OP_LLVM_arg, 155, DW_OP_plus, DW_OP_LLVM_arg, 154, DW_OP_plus, DW_OP_LLVM_arg, 153, DW_OP_plus, DW_OP_LLVM_arg, 152, DW_OP_plus, DW_OP_LLVM_arg, 151, DW_OP_plus, DW_OP_LLVM_arg, 150, DW_OP_plus, DW_OP_LLVM_arg, 149, DW_OP_plus, DW_OP_LLVM_arg, 148, DW_OP_plus, DW_OP_LLVM_arg, 147, DW_OP_plus, DW_OP_LLVM_arg, 146, DW_OP_plus, DW_OP_LLVM_arg, 145, DW_OP_plus, DW_OP_LLVM_arg, 144, DW_OP_plus, DW_OP_LLVM_arg, 143, DW_OP_plus, DW_OP_LLVM_arg, 142, DW_OP_plus, DW_OP_LLVM_arg, 141, DW_OP_plus, DW_OP_LLVM_arg, 140, DW_OP_plus, DW_OP_LLVM_arg, 139, DW_OP_plus, DW_OP_LLVM_arg, 138, DW_OP_plus, DW_OP_LLVM_arg, 137, DW_OP_plus, DW_OP_LLVM_arg, 136, DW_OP_plus, DW_OP_LLVM_arg, 135, DW_OP_plus, DW_OP_LLVM_arg, 134, DW_OP_plus, DW_OP_LLVM_arg, 133, DW_OP_plus, DW_OP_LLVM_arg, 132, DW_OP_plus, DW_OP_LLVM_arg, 131, DW_OP_plus, DW_OP_LLVM_arg, 130, DW_OP_plus, DW_OP_LLVM_arg, 129, DW_OP_plus, DW_OP_LLVM_arg, 128, DW_OP_plus, DW_OP_LLVM_arg, 127, DW_OP_plus, DW_OP_LLVM_arg, 126, DW_OP_plus, DW_OP_LLVM_arg, 125, DW_OP_plus, DW_OP_LLVM_arg, 124, DW_OP_plus, DW_OP_LLVM_arg, 123, DW_OP_plus, DW_OP_LLVM_arg, 122, DW_OP_plus, DW_OP_LLVM_arg, 121, DW_OP_plus, DW_OP_LLVM_arg, 120, DW_OP_plus, DW_OP_LLVM_arg, 119, DW_OP_plus, DW_OP_LLVM_arg, 118, DW_OP_plus, DW_OP_LLVM_arg, 117, DW_OP_plus, DW_OP_LLVM_arg, 116, DW_OP_plus, DW_OP_LLVM_arg, 115, DW_OP_plus, DW_OP_LLVM_arg, 114, DW_OP_plus, DW_OP_LLVM_arg, 113, DW_OP_plus, DW_OP_LLVM_arg, 112, DW_OP_plus, DW_OP_LLVM_arg, 111, DW_OP_plus, DW_OP_LLVM_arg, 110, DW_OP_plus, DW_OP_LLVM_arg, 109, DW_OP_plus, DW_OP_LLVM_arg, 108, DW_OP_plus, DW_OP_LLVM_arg, 107, DW_OP_plus, DW_OP_LLVM_arg, 106, DW_OP_plus, DW_OP_LLVM_arg, 105, DW_OP_plus, DW_OP_LLVM_arg, 104, DW_OP_plus, DW_OP_LLVM_arg, 103, DW_OP_plus, DW_OP_LLVM_arg, 102, DW_OP_plus, DW_OP_LLVM_arg, 101, DW_OP_plus, DW_OP_LLVM_arg, 100, DW_OP_plus, DW_OP_LLVM_arg, 99, DW_OP_plus, DW_OP_LLVM_arg, 98, DW_OP_plus, DW_OP_LLVM_arg, 97, DW_OP_plus, DW_OP_LLVM_arg, 96, DW_OP_plus, DW_OP_LLVM_arg, 95, DW_OP_plus, DW_OP_LLVM_arg, 94, DW_OP_plus, DW_OP_LLVM_arg, 93, DW_OP_plus, DW_OP_LLVM_arg, 92, DW_OP_plus, DW_OP_LLVM_arg, 91, DW_OP_plus, DW_OP_LLVM_arg, 90, DW_OP_plus, DW_OP_LLVM_arg, 89, DW_OP_plus, DW_OP_LLVM_arg, 88, DW_OP_plus, DW_OP_LLVM_arg, 87, DW_OP_plus, DW_OP_LLVM_arg, 86, DW_OP_plus, DW_OP_LLVM_arg, 85, DW_OP_plus, DW_OP_LLVM_arg, 84, DW_OP_plus, DW_OP_LLVM_arg, 83, DW_OP_plus, DW_OP_LLVM_arg, 82, DW_OP_plus, DW_OP_LLVM_arg, 81, DW_OP_plus, DW_OP_LLVM_arg, 80, DW_OP_plus, DW_OP_LLVM_arg, 79, DW_OP_plus, DW_OP_LLVM_arg, 78, DW_OP_plus, DW_OP_LLVM_arg, 77, DW_OP_plus, DW_OP_LLVM_arg, 76, DW_OP_plus, DW_OP_LLVM_arg, 75, DW_OP_plus, DW_OP_LLVM_arg, 74, DW_OP_plus, DW_OP_LLVM_arg, 73, DW_OP_plus, DW_OP_LLVM_arg, 72, DW_OP_plus, DW_OP_LLVM_arg, 71, DW_OP_plus, DW_OP_LLVM_arg, 70, DW_OP_plus, DW_OP_LLVM_arg, 69, DW_OP_plus, DW_OP_LLVM_arg, 68, DW_OP_plus, DW_OP_LLVM_arg, 67, DW_OP_plus, DW_OP_LLVM_arg, 66, DW_OP_plus, DW_OP_LLVM_arg, 65, DW_OP_plus, DW_OP_LLVM_arg, 64, DW_OP_plus, DW_OP_LLVM_arg, 63, DW_OP_plus, DW_OP_LLVM_arg, 62, DW_OP_plus, DW_OP_LLVM_arg, 61, DW_OP_plus, DW_OP_LLVM_arg, 60, DW_OP_plus, DW_OP_LLVM_arg, 59, DW_OP_plus, DW_OP_LLVM_arg, 58, DW_OP_plus, DW_OP_LLVM_arg, 57, DW_OP_plus, DW_OP_LLVM_arg, 56, DW_OP_plus, DW_OP_LLVM_arg, 55, DW_OP_plus, DW_OP_LLVM_arg, 54, DW_OP_plus, DW_OP_LLVM_arg, 53, DW_OP_plus, DW_OP_LLVM_arg, 52, DW_OP_plus, DW_OP_LLVM_arg, 51, DW_OP_plus, DW_OP_LLVM_arg, 50, DW_OP_plus, DW_OP_LLVM_arg, 49, DW_OP_plus, DW_OP_LLVM_arg, 48, DW_OP_plus, DW_OP_LLVM_arg, 47, DW_OP_plus, DW_OP_LLVM_arg, 46, DW_OP_plus, DW_OP_LLVM_arg, 45, DW_OP_plus, DW_OP_LLVM_arg, 44, DW_OP_plus, DW_OP_LLVM_arg, 43, DW_OP_plus, DW_OP_LLVM_arg, 42, DW_OP_plus, DW_OP_LLVM_arg, 41, DW_OP_plus, DW_OP_LLVM_arg, 40, DW_OP_plus, DW_OP_LLVM_arg, 39, DW_OP_plus, DW_OP_LLVM_arg, 38, DW_OP_plus, DW_OP_LLVM_arg, 37, DW_OP_plus, DW_OP_LLVM_arg, 36, DW_OP_plus, DW_OP_LLVM_arg, 35, DW_OP_plus, DW_OP_LLVM_arg, 34, DW_OP_plus, DW_OP_LLVM_arg, 33, DW_OP_plus, DW_OP_LLVM_arg, 32, DW_OP_plus, DW_OP_LLVM_arg, 31, DW_OP_plus, DW_OP_LLVM_arg, 30, DW_OP_plus, DW_OP_LLVM_arg, 29, DW_OP_plus, DW_OP_LLVM_arg, 28, DW_OP_plus, DW_OP_LLVM_arg, 27, DW_OP_plus, DW_OP_LLVM_arg, 26, DW_OP_plus, DW_OP_LLVM_arg, 25, DW_OP_plus, DW_OP_LLVM_arg, 24, DW_OP_plus, DW_OP_LLVM_arg, 23, DW_OP_plus, DW_OP_LLVM_arg, 22, DW_OP_plus, DW_OP_LLVM_arg, 21, DW_OP_plus, DW_OP_LLVM_arg, 20, DW_OP_plus, DW_OP_LLVM_arg, 19, DW_OP_plus, DW_OP_LLVM_arg, 18, DW_OP_plus, DW_OP_LLVM_arg, 17, DW_OP_plus, DW_OP_LLVM_arg, 16, DW_OP_plus, DW_OP_LLVM_arg, 15, DW_OP_plus, DW_OP_LLVM_arg, 14, DW_OP_plus, DW_OP_LLVM_arg, 13, DW_OP_plus, DW_OP_LLVM_arg, 12, DW_OP_plus, DW_OP_LLVM_arg, 11, DW_OP_plus, DW_OP_LLVM_arg, 10, DW_OP_plus, DW_OP_LLVM_arg, 9, DW_OP_plus, DW_OP_LLVM_arg, 8, DW_OP_plus, DW_OP_LLVM_arg, 7, DW_OP_plus, DW_OP_LLVM_arg, 6, DW_OP_plus, DW_OP_LLVM_arg, 5, DW_OP_plus, DW_OP_LLVM_arg, 4, DW_OP_plus, DW_OP_LLVM_arg, 3, DW_OP_plus, DW_OP_LLVM_arg, 2, DW_OP_plus, DW_OP_LLVM_arg, 1, DW_OP_plus, DW_OP_stack_value)), !dbg !135225

[StephenTozer]

In D91722#2781128, @wenlei wrote:

We're seeing a pathological case with 36ec97f76ac0d8be76fb16ac521f55126766267d (3rd Reapply "[DebugInfo] Use variadic debug values to salvage BinOps and GEP instrs with non-const operands).

I didn't encounter any such cases while testing this patch, but it's certainly possible for it to occur. Personally, I think the best approach for this is to impose a limit on the number of args that can be added to a DIArgList by salvaging - it's clear that it is not feasible to salvage everywhere we possibly can. I think that a max of 32 is probably a reasonable amount, but if you have a reproducer for this issue I can do some performance testing myself to more accurately determine a sensible limit.

I do believe that InstCombine also has a problem with massively inflating the number of debug intrinsics in a function; the slowdown factor you're seeing is probably the product of these two factors.

[StephenTozer]

I've opened review D103162 to fix the performance issue described above.

[wenlei]

In D91722#2781418, @StephenTozer wrote:

In D91722#2781128, @wenlei wrote:

We're seeing a pathological case with 36ec97f76ac0d8be76fb16ac521f55126766267d (3rd Reapply "[DebugInfo] Use variadic debug values to salvage BinOps and GEP instrs with non-const operands).

I didn't encounter any such cases while testing this patch, but it's certainly possible for it to occur. Personally, I think the best approach for this is to impose a limit on the number of args that can be added to a DIArgList by salvaging - it's clear that it is not feasible to salvage everywhere we possibly can. I think that a max of 32 is probably a reasonable amount, but if you have a reproducer for this issue I can do some performance testing myself to more accurately determine a sensible limit.

I do believe that InstCombine also has a problem with massively inflating the number of debug intrinsics in a function; the slowdown factor you're seeing is probably the product of these two factors.

The case we hit is from an internal codebase. Thanks for the fix in D103162. I will try 16 and 32 as the limit and report back there.

[aheejin]

In D91722#2774622, @sbc100 wrote:

In D91722#2774612, @jmorse wrote:

In D91722#2774557, @sbc100 wrote:

After the third re-land of this patch we are seeing a crash in the emscripten compiler: https://logs.chromium.org/logs/emscripten-releases/buildbucket/cr-buildbucket.appspot.com/8846604336499720256/+/steps/Emscripten_testsuite__upstream__other_/0/stdout

Thanks for the report -- we're out of working hours in the UK timezone and I can't revert myself, if you could revert this for us, please do.

We are investigating now. I looks like this assert only fires in combination with WebAssemlby change that was landed between the 2nd and 3rd re-landing: https://reviews.llvm.org/D102589. I think we will try to fix forward if we can and if that fails revert either or the other.

This turned out to be a bug in WebAssembly side. We fixed it so nevermind!

[dblaikie]

In D91722#2782868, @aheejin wrote:

In D91722#2774622, @sbc100 wrote:

In D91722#2774612, @jmorse wrote:

In D91722#2774557, @sbc100 wrote:

After the third re-land of this patch we are seeing a crash in the emscripten compiler: https://logs.chromium.org/logs/emscripten-releases/buildbucket/cr-buildbucket.appspot.com/8846604336499720256/+/steps/Emscripten_testsuite__upstream__other_/0/stdout

Thanks for the report -- we're out of working hours in the UK timezone and I can't revert myself, if you could revert this for us, please do.

We are investigating now. I looks like this assert only fires in combination with WebAssemlby change that was landed between the 2nd and 3rd re-landing: https://reviews.llvm.org/D102589. I think we will try to fix forward if we can and if that fails revert either or the other.

This turned out to be a bug in WebAssembly side. We fixed it so nevermind!

Might be handy to include a link to the fix here for context (in case other folks with out of tree backends hit similar issues, etc)

[StephenTozer]

In D91722#2783033, @dblaikie wrote:

Might be handy to include a link to the fix here for context (in case other folks with out of tree backends hit similar issues, etc)

I believe the fix in question is here: D102999

[hans]

We're seeing build non-determinism in Chromium after this patch (after 36ec97f76ac0d8be76fb16ac521f55126766267d specifically). See https://bugs.chromium.org/p/chromium/issues/detail?id=1216316#c20 for a reproducer.

[aeubanks]

llvm/lib/Transforms/Utils/Local.cpp

67

could this be causing non-determinism?

[hans]

Reverted in 386b66b2fc297cda121a3cc8a36887a6ecbcfc68 until this can be fixed.

llvm/lib/Transforms/Utils/Local.cpp

67

I tried changing VariableOffsets into a MapVector, but that wasn't enough to make the output of my reproducer deterministic.

[StephenTozer]

llvm/lib/Transforms/Utils/Local.cpp

67

This is a potential source of non-determinism, but in this case it was actually in a different piece of code from an earlier patch, although this patch depends on that one and exposes the incorrect behaviour. I'm opening up a patch to fix that other incorrect behaviour, and will also fix this in the next reapply.

[StephenTozer]

Fix for the determinism bug at D104105

[thakis]

https://reviews.llvm.org/rGadace79652174d126be290cab42b3122569fe15d made llvm crash (or assert, when assertions are on) when building some chromium binary: https://bugs.chromium.org/p/chromium/issues/detail?id=1224338

Given how many reverts this went through and given that this commit was structured to be optimized for reverts, I went ahead and revert that in 540b4a5fb31086b6d40735e96e6ec497022107e7

[thakis]

In D91722#2844379, @thakis wrote:

https://reviews.llvm.org/rGadace79652174d126be290cab42b3122569fe15d made llvm crash (or assert, when assertions are on) when building some chromium binary: https://bugs.chromium.org/p/chromium/issues/detail?id=1224338

Given how many reverts this went through and given that this commit was structured to be optimized for reverts, I went ahead and revert that in 540b4a5fb31086b6d40735e96e6ec497022107e7

Here's a stand-alone repro for that crash: https://bugs.chromium.org/p/chromium/issues/detail?id=1224338#c5 , https://bugs.chromium.org/p/chromium/issues/detail?id=1224338#c6

[glandium]

The relanding in 47633af9d4a8b93f50cb711cf23489736e0226f1 broke determinism for Firefox.

[StephenTozer]

In D91722#3101440, @glandium wrote:

The relanding in 47633af9d4a8b93f50cb711cf23489736e0226f1 broke determinism for Firefox.

Do you have any more info about the non-deterministic build? If there's a reduced or packaged reproducer that would be ideal, and a link to a buildbot demonstrating the failure would also be very helpful. Otherwise, knowing which version of Firefox the non-determinism shows up in and the build flags+config would be useful, along with any more details about where the non-determinism appears specifically (i.e. which object file(s)).

[StephenTozer]

In D91722#3101440, @glandium wrote:

The relanding in 47633af9d4a8b93f50cb711cf23489736e0226f1 broke determinism for Firefox.

Has the non-determinism problem been fixed with the landing of rG3c47c5ca13b8a502de3272e8105548715947b7a8?

[glandium]

In D91722#3121293, @StephenTozer wrote:

In D91722#3101440, @glandium wrote:

The relanding in 47633af9d4a8b93f50cb711cf23489736e0226f1 broke determinism for Firefox.

Has the non-determinism problem been fixed with the landing of rG3c47c5ca13b8a502de3272e8105548715947b7a8?

That seems to fix the non-determinism issue introduced in D106585, but not this one. It seems this was fixed on trunk, though. I'm bisecting to find what fixed it.

Edit: rGbadcd585897253e94b7b2d4e6f9f430a2020d642 is what fixed this one.

llvm/include/llvm/IR/DebugInfoMetadata.h

public:
 
   unsigned getNumElements() const { return Elements.size(); }
 
   uint64_t getElement(unsigned I) const {
     assert(I < Elements.size() && "Index out of range");
     return Elements[I];
   }
 
+  /// Return the number of unique location operands referred to (via
+  /// DW_OP_LLVM_arg) in this expression; this is not necessarily the number of
+  /// instances of DW_OP_LLVM_arg within the expression.
+  /// For example, for the expression:
+  ///   (DW_OP_LLVM_arg 0, DW_OP_LLVM_arg 1, DW_OP_plus,
+  ///    DW_OP_LLVM_arg 0, DW_OP_mul)
+  /// This function would return 2, as there are two unique location operands
+  /// (0 and 1).
+  uint64_t getLocationOperandCount() const;
+
   /// Determine whether this represents a standalone constant value.
   bool isConstant() const;
 
   using element_iterator = ArrayRef<uint64_t>::iterator;
 
   element_iterator elements_begin() const { return getElements().begin(); }
   element_iterator elements_end() const { return getElements().end(); }
 
public:
 
   /// Append \p Ops with operations to apply the \p Offset.
   static void appendOffset(SmallVectorImpl<uint64_t> &Ops, int64_t Offset);
 
   /// If this is a constant offset, extract it. If there is no expression,
   /// return true with an offset of zero.
   bool extractIfOffset(int64_t &Offset) const;
 
+  /// Returns true iff this DIExpression contains at least one instance of
+  /// `DW_OP_LLVM_arg, n` for all n in [0, N).
+  bool hasAllLocationOps(unsigned N) const;
+
   /// Checks if the last 4 elements of the expression are DW_OP_constu <DWARF
   /// Address Space> DW_OP_swap DW_OP_xderef and extracts the <DWARF Address
   /// Space>.
   static const DIExpression *extractAddressClass(const DIExpression *Expr,
                                                  unsigned &AddrClass);
 
   /// Used for DIExpression::prepend.
   enum PrependOps : uint8_t {

llvm/include/llvm/IR/Instructions.h

public:
   ///
   /// This routine accepts an APInt into which it will accumulate the constant
   /// offset of this GEP if the GEP is in fact constant. If the GEP is not
   /// all-constant, it returns false and the value of the offset APInt is
   /// undefined (it is *not* preserved!). The APInt passed into this routine
   /// must be at least as wide as the IntPtr type for the address space of
   /// the base GEP pointer.
   bool accumulateConstantOffset(const DataLayout &DL, APInt &Offset) const;
-
+  bool collectOffset(const DataLayout &DL, unsigned BitWidth,
+                     SmallDenseMap<Value *, APInt, 8> &VariableOffsets,
+                     APInt &ConstantOffset) const;
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static bool classof(const Instruction *I) {
     return (I->getOpcode() == Instruction::GetElementPtr);
   }
   static bool classof(const Value *V) {
     return isa<Instruction>(V) && classof(cast<Instruction>(V));
   }
 };

llvm/include/llvm/IR/IntrinsicInst.h

 public:
   /// Get the location corresponding to the variable referenced by the debug
   /// info intrinsic.  Depending on the intrinsic, this could be the
   /// variable's value or its address.
   SmallVector<Value *, 4> getVariableLocationOps(bool AllowNullOp = true) const;
   Value *getVariableLocationOp(unsigned OpIdx, bool AllowNullOp = true) const;
 
   void replaceVariableLocationOp(Value *OldValue, Value *NewValue);
+  /// Adding a new location operand will always result in this intrinsic using
+  /// an ArgList, and must always be accompanied by a new expression that uses
+  /// the new operand.
+  void addVariableLocationOps(ArrayRef<Value *> NewValues,
+                              DIExpression *NewExpr);
 
   void setVariable(DILocalVariable *NewVar) {
     setArgOperand(1, MetadataAsValue::get(NewVar->getContext(), NewVar));
   }
 
   void setExpression(DIExpression *NewExpr) {
     setArgOperand(2, MetadataAsValue::get(NewExpr->getContext(), NewExpr));
   }

llvm/include/llvm/IR/Operator.h

public:
   /// false and the value of the offset APInt is undefined (it is *not*
   /// preserved!).
   ///
   /// The APInt passed into this routine must be at exactly as wide as the
   /// IntPtr type for the address space of the base GEP pointer.
   bool accumulateConstantOffset(
       const DataLayout &DL, APInt &Offset,
       function_ref<bool(Value &, APInt &)> ExternalAnalysis = nullptr) const;
+
+  /// Collect the offset of this GEP as a map of Values to their associated
+  /// APInt multipliers.
+  ///
+  /// The nullptr key maps to the total constant offset, rather than a
+  /// multiplier.
+  bool collectOffset(const DataLayout &DL, unsigned BitWidth,
+                     SmallDenseMap<Value *, APInt, 8> &VariableOffsets,
+                     APInt &ConstantOffset) const;
 };
 
 class PtrToIntOperator
     : public ConcreteOperator<Operator, Instruction::PtrToInt> {
   friend class PtrToInt;
   friend class ConstantExpr;
 
 public:

llvm/include/llvm/Transforms/Utils/Local.h

void salvageDebugInfoForDbgValues(Instruction &I,
                                   ArrayRef<DbgVariableIntrinsic *> Insns);
 
 /// Given an instruction \p I and DIExpression \p DIExpr operating on it, write
 /// the effects of \p I into the returned DIExpression, or return nullptr if
 /// it cannot be salvaged. \p StackVal: whether DW_OP_stack_value should be
 /// appended to the expression. \p LocNo: the index of the location operand to
 /// which \p I applies, should be 0 for debug info without a DIArgList.
 DIExpression *salvageDebugInfoImpl(Instruction &I, DIExpression *DIExpr,
-                                   bool StackVal, unsigned LocNo);
+                                   bool StackVal, unsigned LocNo,
+                                   SmallVectorImpl<Value *> &AdditionalValues);
 
 /// Point debug users of \p From to \p To or salvage them. Use this function
 /// only when replacing all uses of \p From with \p To, with a guarantee that
 /// \p From is going to be deleted.
 ///
 /// Follow these rules to prevent use-before-def of \p To:
 ///   . If \p To is a linked Instruction, set \p DomPoint to \p To.
 ///   . If \p To is an unlinked Instruction, set \p DomPoint to the Instruction

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

if (Val.getNode()) {
           DAG.getConstantDbgValue(Variable, Expr, Undef, dl, DbgSDNodeOrder);
       DAG.AddDbgValue(SDV, false);
     }
   }
   DDIV.clear();
 }
 
 void SelectionDAGBuilder::salvageUnresolvedDbgValue(DanglingDebugInfo &DDI) {
+  // TODO: For the variadic implementation, instead of only checking the fail
+  // state of `handleDebugValue`, we need know specifically which values were
+  // invalid, so that we only attempt to salvage those values when processing
+  // a DIArgList.
   assert(!isa<DIArgList>(DDI.getDI()->getRawLocation()) &&
          "Not implemented for variadic dbg_values");
   Value *V = DDI.getDI()->getValue(0);
   DILocalVariable *Var = DDI.getDI()->getVariable();
   DIExpression *Expr = DDI.getDI()->getExpression();
   DebugLoc DL = DDI.getdl();
   DebugLoc InstDL = DDI.getDI()->getDebugLoc();
   unsigned SDOrder = DDI.getSDNodeOrder();
   // Currently we consider only dbg.value intrinsics -- we tell the salvager
   // that DW_OP_stack_value is desired.
   assert(isa<DbgValueInst>(DDI.getDI()));
   bool StackValue = true;
 
   // Can this Value can be encoded without any further work?
   if (handleDebugValue(V, Var, Expr, DL, InstDL, SDOrder, /*IsVariadic=*/false))
     return;
 
   // Attempt to salvage back through as many instructions as possible. Bail if
   // a non-instruction is seen, such as a constant expression or global
   // variable. FIXME: Further work could recover those too.
   while (isa<Instruction>(V)) {
     Instruction &VAsInst = *cast<Instruction>(V);
     // Temporary "0", awaiting real implementation.
-    DIExpression *NewExpr = salvageDebugInfoImpl(VAsInst, Expr, StackValue, 0);
+    SmallVector<Value *, 4> AdditionalValues;
+    DIExpression *SalvagedExpr =
+        salvageDebugInfoImpl(VAsInst, Expr, StackValue, 0, AdditionalValues);
 
     // If we cannot salvage any further, and haven't yet found a suitable debug
     // expression, bail out.
-    if (!NewExpr)
+    // TODO: If AdditionalValues isn't empty, then the salvage can only be
+    // represented with a DBG_VALUE_LIST, so we give up. When we have support
+    // here for variadic dbg_values, remove that condition.
+    if (!SalvagedExpr || !AdditionalValues.empty())
       break;
 
     // New value and expr now represent this debuginfo.
     V = VAsInst.getOperand(0);
-    Expr = NewExpr;
+    Expr = SalvagedExpr;
 
     // Some kind of simplification occurred: check whether the operand of the
     // salvaged debug expression can be encoded in this DAG.
     if (handleDebugValue(V, Var, Expr, DL, InstDL, SDOrder,
                          /*IsVariadic=*/false)) {
       LLVM_DEBUG(dbgs() << "Salvaged debug location info for:\n  "
                         << DDI.getDI() << "\nBy stripping back to:\n  " << V);
       return;

llvm/lib/IR/DebugInfoMetadata.cpp

if (Elements[2] == dwarf::DW_OP_minus) {
       Offset = -Elements[1];
       return true;
     }
   }
 
   return false;
 }
 
+bool DIExpression::hasAllLocationOps(unsigned N) const {
+  SmallDenseSet<uint64_t, 4> SeenOps;
+  for (auto ExprOp : expr_ops())
+    if (ExprOp.getOp() == dwarf::DW_OP_LLVM_arg)
+      SeenOps.insert(ExprOp.getArg(0));
+  for (uint64_t Idx = 0; Idx < N; ++Idx)
+    if (!is_contained(SeenOps, Idx))
+      return false;
+  return true;
+}
+
 const DIExpression *DIExpression::extractAddressClass(const DIExpression *Expr,
                                                       unsigned &AddrClass) {
   // FIXME: This seems fragile. Nothing that verifies that these elements
   // actually map to ops and not operands.
   const unsigned PatternSize = 4;
   if (Expr->Elements.size() >= PatternSize &&
       Expr->Elements[PatternSize - 4] == dwarf::DW_OP_constu &&
       Expr->Elements[PatternSize - 2] == dwarf::DW_OP_swap &&
Optional<DIExpression *> DIExpression::createFragmentExpression(
   }
   assert(Expr && "Unknown DIExpression");
   Ops.push_back(dwarf::DW_OP_LLVM_fragment);
   Ops.push_back(OffsetInBits);
   Ops.push_back(SizeInBits);
   return DIExpression::get(Expr->getContext(), Ops);
 }
 
+uint64_t DIExpression::getLocationOperandCount() const {
+  uint64_t Result = 0;
+  for (auto ExprOp : expr_ops())
+    if (ExprOp.getOp() == dwarf::DW_OP_LLVM_arg)
+      Result = Result <= ExprOp.getArg(0) ? ExprOp.getArg(0) + 1 : Result;
+  assert(hasAllLocationOps(Result) &&
+         "Expression is missing one or more location operands.");
+  return Result;
+}
+
 bool DIExpression::isConstant() const {
   // Recognize DW_OP_constu C DW_OP_stack_value (DW_OP_LLVM_fragment Len Ofs)?.
   if (getNumElements() != 3 && getNumElements() != 6)
     return false;
   if (getElement(0) != dwarf::DW_OP_constu ||
       getElement(2) != dwarf::DW_OP_stack_value)
     return false;
   if (getNumElements() == 6 && getElement(3) != dwarf::DW_OP_LLVM_fragment)

llvm/lib/IR/Instructions.cpp

 }
 
 bool GetElementPtrInst::accumulateConstantOffset(const DataLayout &DL,
                                                  APInt &Offset) const {
   // Delegate to the generic GEPOperator implementation.
   return cast<GEPOperator>(this)->accumulateConstantOffset(DL, Offset);
 }
 
+bool GetElementPtrInst::collectOffset(
+    const DataLayout &DL, unsigned BitWidth,
+    SmallDenseMap<Value *, APInt, 8> &VariableOffsets,
+    APInt &ConstantOffset) const {
+  // Delegate to the generic GEPOperator implementation.
+  return cast<GEPOperator>(this)->collectOffset(DL, BitWidth, VariableOffsets,
+                                                ConstantOffset);
+}
+
 //===----------------------------------------------------------------------===//
 //                           ExtractElementInst Implementation
 //===----------------------------------------------------------------------===//
 
 ExtractElementInst::ExtractElementInst(Value *Val, Value *Index,
                                        const Twine &Name,
                                        Instruction *InsertBef)
   : Instruction(cast<VectorType>(Val->getType())->getElementType(),

llvm/lib/IR/IntrinsicInst.cpp

void DbgVariableIntrinsic::replaceVariableLocationOp(Value *OldValue,
   SmallVector<ValueAsMetadata *, 4> MDs;
   ValueAsMetadata *NewOperand = getAsMetadata(NewValue);
   for (auto *VMD : Locations)
     MDs.push_back(VMD == *OldIt ? NewOperand : getAsMetadata(VMD));
   setArgOperand(
       0, MetadataAsValue::get(getContext(), DIArgList::get(getContext(), MDs)));
 }
 
+void DbgVariableIntrinsic::addVariableLocationOps(ArrayRef<Value *> NewValues,
+                                                  DIExpression *NewExpr) {
+  assert(NewExpr->hasAllLocationOps(getNumVariableLocationOps() +
+                                    NewValues.size()) &&
+         "NewExpr for debug variable intrinsic does not reference every "
+         "location operand.");
+  setArgOperand(2, MetadataAsValue::get(getContext(), NewExpr));
+  auto LocationOps = getVariableLocationOps();
+  SmallVector<ValueAsMetadata *, 4> MDs;
+  for (auto *VMD : LocationOps)
+    MDs.push_back(getAsMetadata(VMD));
+  for (auto *VMD : NewValues)
+    MDs.push_back(getAsMetadata(VMD));
+  setArgOperand(
+      0, MetadataAsValue::get(getContext(), DIArgList::get(getContext(), MDs)));
+}
+
 Optional<uint64_t> DbgVariableIntrinsic::getFragmentSizeInBits() const {
   if (auto Fragment = getExpression()->getFragmentInfo())
     return Fragment->SizeInBits;
   return getVariable()->getSizeInBits();
 }
 
 int llvm::Intrinsic::lookupLLVMIntrinsicByName(ArrayRef<const char *> NameTable,
                                                StringRef Name) {

llvm/lib/IR/Operator.cpp

if (!ExternalAnalysis(*V, AnalysisIndex))
       return false;
     UsedExternalAnalysis = true;
     if (!AccumulateOffset(AnalysisIndex,
                           DL.getTypeAllocSize(GTI.getIndexedType())))
       return false;
   }
   return true;
 }
+
+bool GEPOperator::collectOffset(
+    const DataLayout &DL, unsigned BitWidth,
+    SmallDenseMap<Value *, APInt, 8> &VariableOffsets,
+    APInt &ConstantOffset) const {
+  assert(BitWidth == DL.getIndexSizeInBits(getPointerAddressSpace()) &&
+         "The offset bit width does not match DL specification.");
+
+  bool UsedExternalAnalysis = false;
+
+  auto CollectConstantOffset = [&](APInt Index, uint64_t Size) {
+    Index = Index.sextOrTrunc(BitWidth);
+    APInt IndexedSize = APInt(BitWidth, Size);
+    ConstantOffset += Index * IndexedSize;
+  };
+
+  for (gep_type_iterator GTI = gep_type_begin(this), GTE = gep_type_end(this);
+       GTI != GTE; ++GTI) {
+    // Scalable vectors are multiplied by a runtime constant.
+    bool ScalableType = isa<ScalableVectorType>(GTI.getIndexedType());
+
+    Value *V = GTI.getOperand();
+    StructType *STy = GTI.getStructTypeOrNull();
+    // Handle ConstantInt if possible.
+    if (auto ConstOffset = dyn_cast<ConstantInt>(V)) {
+      if (ConstOffset->isZero())
+        continue;
+      // If the type is scalable and the constant is not zero (vscale * n * 0 =
+      // 0) bailout.
+      // TODO: If the runtime value is accessible at any point before DWARF
+      // emission, then we could potentially keep a forward reference to it
+      // in the debug value to be filled in later.
+      if (ScalableType)
+        return false;
+      // Handle a struct index, which adds its field offset to the pointer.
+      if (STy) {
+        unsigned ElementIdx = ConstOffset->getZExtValue();
+        const StructLayout *SL = DL.getStructLayout(STy);
+        // Element offset is in bytes.
+        CollectConstantOffset(APInt(BitWidth, SL->getElementOffset(ElementIdx)),
+                              1);
+        continue;
+      }
+      CollectConstantOffset(ConstOffset->getValue(),
+                            DL.getTypeAllocSize(GTI.getIndexedType()));
+      continue;
+    }
+
+    if (STy || ScalableType)
+      return false;
+    // Insert an initial offset of 0 for V iff none exists already, then
+    // increment the offset by IndexedSize.
+    VariableOffsets.try_emplace(V, BitWidth, 0);
+    APInt IndexedSize =
+        APInt(BitWidth, DL.getTypeAllocSize(GTI.getIndexedType()));
+    VariableOffsets[V] += IndexedSize;
+  }
+  return true;
+}
 } // namespace llvm

llvm/lib/Transforms/Utils/Local.cpp

 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/MDBuilder.h"
 #include "llvm/IR/Metadata.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Operator.h"
 #include "llvm/IR/PatternMatch.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Use.h"
 #include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
 #include "llvm/IR/ValueHandle.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
for (auto *DII : DbgUsers) {
     // are implicitly pointing out the value as a DWARF memory location
     // description.
     bool StackValue = isa<DbgValueInst>(DII);
     auto DIILocation = DII->getVariableLocationOps();
     assert(
         is_contained(DIILocation, &I) &&
         "DbgVariableIntrinsic must use salvaged instruction as its location");
     unsigned LocNo = std::distance(DIILocation.begin(), find(DIILocation, &I));
-
-    DIExpression *DIExpr =
-        salvageDebugInfoImpl(I, DII->getExpression(), StackValue, LocNo);
+    SmallVector<Value *, 4> AdditionalValues;
+    DIExpression *SalvagedExpr = salvageDebugInfoImpl(
+        I, DII->getExpression(), StackValue, LocNo, AdditionalValues);
 
     // salvageDebugInfoImpl should fail on examining the first element of
     // DbgUsers, or none of them.
-    if (!DIExpr)
+    if (!SalvagedExpr)
       break;
 
     DII->replaceVariableLocationOp(&I, I.getOperand(0));
-    DII->setExpression(DIExpr);
+    if (AdditionalValues.empty())
+      DII->setExpression(SalvagedExpr);
+    else
+      DII->addVariableLocationOps(AdditionalValues, SalvagedExpr);
     LLVM_DEBUG(dbgs() << "SALVAGE: " << *DII << '\n');
     Salvaged = true;
   }
 
   if (Salvaged)
     return;
 
   for (auto *DII : DbgUsers) {
     Value *Undef = UndefValue::get(I.getType());
     DII->replaceVariableLocationOp(&I, Undef);
   }
 }
 
-DIExpression *llvm::salvageDebugInfoImpl(Instruction &I,
-                                         DIExpression *SrcDIExpr,
-                                         bool WithStackValue, unsigned LocNo) {
+bool getSalvageOpsForGEP(GetElementPtrInst *GEP, const DataLayout &DL,
+                         uint64_t CurrentLocOps,
+                         SmallVectorImpl<uint64_t> &Opcodes,
+                         SmallVectorImpl<Value *> &AdditionalValues) {
+  unsigned BitWidth = DL.getIndexSizeInBits(GEP->getPointerAddressSpace());
+  // Rewrite a GEP into a DIExpression.
+  SmallDenseMap<Value *, APInt, 8> VariableOffsets;
+  APInt ConstantOffset(BitWidth, 0);
+  if (!GEP->collectOffset(DL, BitWidth, VariableOffsets, ConstantOffset))
+    return false;
+  if (!VariableOffsets.empty() && !CurrentLocOps) {
+    Opcodes.insert(Opcodes.begin(), {dwarf::DW_OP_LLVM_arg, 0});
+    CurrentLocOps = 1;
+  }
+  for (auto Offset : VariableOffsets) {
+    AdditionalValues.push_back(Offset.first);
+    assert(Offset.second.isStrictlyPositive() &&
+           "Expected strictly positive multiplier for offset.");
+    Opcodes.append({dwarf::DW_OP_LLVM_arg, CurrentLocOps++, dwarf::DW_OP_constu,
+                    Offset.second.getZExtValue(), dwarf::DW_OP_mul,
+                    dwarf::DW_OP_plus});
+  }
+  if (ConstantOffset.getBoolValue())
+    DIExpression::appendOffset(Opcodes, ConstantOffset.getSExtValue());
+  return true;
+}
+
+bool getSalvageOpsForBinOp(BinaryOperator *BI, uint64_t CurrentLocOps,
+                           SmallVectorImpl<uint64_t> &Opcodes,
+                           SmallVectorImpl<Value *> &AdditionalValues) {
+  // Handle binary operations with constant integer operands as a special case.
+  auto *ConstInt = dyn_cast<ConstantInt>(BI->getOperand(1));
+  // Values wider than 64 bits cannot be represented within a DWARF location
+  // expression.
+  if (ConstInt && ConstInt->getBitWidth() > 64)
+    return false;
+
+  // Push any Constant Int operand onto the expression stack.
+  if (ConstInt) {
+    uint64_t Val = ConstInt->getSExtValue();
+    // Add or Sub Instructions with a constant operand can potentially be
+    // simplified.
+    if (BI->getOpcode() == Instruction::Add) {
+      DIExpression::appendOffset(Opcodes, Val);
+      return true;
+    }
+    if (BI->getOpcode() == Instruction::Sub) {
+      DIExpression::appendOffset(Opcodes, -int64_t(Val));
+      return true;
+    }
+    Opcodes.append({dwarf::DW_OP_constu, Val});
+  } else {
+    if (!CurrentLocOps) {
+      Opcodes.append({dwarf::DW_OP_LLVM_arg, 0});
+      CurrentLocOps = 1;
+    }
+    Opcodes.append({dwarf::DW_OP_LLVM_arg, CurrentLocOps});
+    AdditionalValues.push_back(BI->getOperand(1));
+  }
+
+  // Add salvaged binary operator to expression stack.
+  switch (BI->getOpcode()) {
+  case Instruction::Add:
+    Opcodes.push_back(dwarf::DW_OP_plus);
+    break;
+  case Instruction::Sub:
+    Opcodes.push_back(dwarf::DW_OP_minus);
+    break;
+  case Instruction::Mul:
+    Opcodes.push_back(dwarf::DW_OP_mul);
+    break;
+  case Instruction::SDiv:
+    Opcodes.push_back(dwarf::DW_OP_div);
+    break;
+  case Instruction::SRem:
+    Opcodes.push_back(dwarf::DW_OP_mod);
+    break;
+  case Instruction::Or:
+    Opcodes.push_back(dwarf::DW_OP_or);
+    break;
+  case Instruction::And:
+    Opcodes.push_back(dwarf::DW_OP_and);
+    break;
+  case Instruction::Xor:
+    Opcodes.push_back(dwarf::DW_OP_xor);
+    break;
+  case Instruction::Shl:
+    Opcodes.push_back(dwarf::DW_OP_shl);
+    break;
+  case Instruction::LShr:
+    Opcodes.push_back(dwarf::DW_OP_shr);
+    break;
+  case Instruction::AShr:
+    Opcodes.push_back(dwarf::DW_OP_shra);
+    break;
+  default:
+    // TODO: Salvage from each kind of binop we know about.
+    return false;
+  }
+  return true;
+}
+
+DIExpression *
+llvm::salvageDebugInfoImpl(Instruction &I, DIExpression *SrcDIExpr,
+                           bool WithStackValue, unsigned LocNo,
+                           SmallVectorImpl<Value *> &AdditionalValues) {
+  uint64_t CurrentLocOps = SrcDIExpr->getLocationOperandCount();
   auto &M = *I.getModule();
   auto &DL = M.getDataLayout();
 
   // Apply a vector of opcodes to the source DIExpression.
   auto doSalvage = [&](SmallVectorImpl<uint64_t> &Ops) -> DIExpression * {
     DIExpression *DIExpr = SrcDIExpr;
     if (!Ops.empty()) {
       DIExpr = DIExpression::appendOpsToArg(DIExpr, Ops, LocNo, WithStackValue);
     }
     return DIExpr;
   };
 
-  // Apply the given offset to the source DIExpression.
-  auto applyOffset = [&](uint64_t Offset) -> DIExpression * {
-    SmallVector<uint64_t, 8> Ops;
-    DIExpression::appendOffset(Ops, Offset);
-    return doSalvage(Ops);
-  };
-
   // initializer-list helper for applying operators to the source DIExpression.
-  auto applyOps = [&](ArrayRef<uint64_t> Opcodes) -> DIExpression * {
+  auto applyOps = [&](ArrayRef<uint64_t> Opcodes) {
     SmallVector<uint64_t, 8> Ops(Opcodes.begin(), Opcodes.end());
     return doSalvage(Ops);
   };
 
   if (auto *CI = dyn_cast<CastInst>(&I)) {
     // No-op casts are irrelevant for debug info.
     if (CI->isNoopCast(DL))
       return SrcDIExpr;
 
     Type *Type = CI->getType();
     // Casts other than Trunc, SExt, or ZExt to scalar types cannot be salvaged.
     if (Type->isVectorTy() ||
         !(isa<TruncInst>(&I) || isa<SExtInst>(&I) || isa<ZExtInst>(&I)))
       return nullptr;
 
     Value *FromValue = CI->getOperand(0);
     unsigned FromTypeBitSize = FromValue->getType()->getScalarSizeInBits();
     unsigned ToTypeBitSize = Type->getScalarSizeInBits();
 
     return applyOps(DIExpression::getExtOps(FromTypeBitSize, ToTypeBitSize,
                                             isa<SExtInst>(&I)));
   }
-
+  SmallVector<uint64_t, 8> Ops;
   if (auto *GEP = dyn_cast<GetElementPtrInst>(&I)) {
-    unsigned BitWidth =
-        M.getDataLayout().getIndexSizeInBits(GEP->getPointerAddressSpace());
-    // Rewrite a constant GEP into a DIExpression.
-    APInt Offset(BitWidth, 0);
-    if (GEP->accumulateConstantOffset(M.getDataLayout(), Offset)) {
-      return applyOffset(Offset.getSExtValue());
-    } else {
-      return nullptr;
-    }
+    if (getSalvageOpsForGEP(GEP, DL, CurrentLocOps, Ops, AdditionalValues))
+      return doSalvage(Ops);
   } else if (auto *BI = dyn_cast<BinaryOperator>(&I)) {
-    // Rewrite binary operations with constant integer operands.
-    auto *ConstInt = dyn_cast<ConstantInt>(I.getOperand(1));
-    if (!ConstInt || ConstInt->getBitWidth() > 64)
-      return nullptr;
-
-    uint64_t Val = ConstInt->getSExtValue();
-    switch (BI->getOpcode()) {
-    case Instruction::Add:
-      return applyOffset(Val);
-    case Instruction::Sub:
-      return applyOffset(-int64_t(Val));
-    case Instruction::Mul:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_mul});
-    case Instruction::SDiv:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_div});
-    case Instruction::SRem:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_mod});
-    case Instruction::Or:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_or});
-    case Instruction::And:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_and});
-    case Instruction::Xor:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_xor});
-    case Instruction::Shl:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_shl});
-    case Instruction::LShr:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_shr});
-    case Instruction::AShr:
-      return applyOps({dwarf::DW_OP_constu, Val, dwarf::DW_OP_shra});
-    default:
-      // TODO: Salvage constants from each kind of binop we know about.
-      return nullptr;
-    }
-    // *Not* to do: we should not attempt to salvage load instructions,
-    // because the validity and lifetime of a dbg.value containing
-    // DW_OP_deref becomes difficult to analyze. See PR40628 for examples.
-  }
+    if (getSalvageOpsForBinOp(BI, CurrentLocOps, Ops, AdditionalValues))
+      return doSalvage(Ops);
   return nullptr;
 }
 
 /// A replacement for a dbg.value expression.
 using DbgValReplacement = Optional<DIExpression *>;
 
 /// Point debug users of \p From to \p To using exprs given by \p RewriteExpr,
 /// possibly moving/undefing users to prevent use-before-def. Returns true if

llvm/test/DebugInfo/salvage-gep.ll

+; RUN: opt %s -dce -S | FileCheck %s
+
+; Tests the salvaging of GEP instructions, specifically struct indexing and
+; non-constant array indexing.
+
+%struct.S = type { i32, i32 }
+
+; CHECK: call void @llvm.dbg.value(metadata !DIArgList(%struct.S* %ptr, i64 %offset),
+; CHECK-SAME: ![[VAR_OFFSET_PTR:[0-9]+]],
+; CHECK-SAME: !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 8, DW_OP_mul, DW_OP_plus, DW_OP_plus_uconst, 4, DW_OP_stack_value))
+
+; CHECK: ![[VAR_OFFSET_PTR]] = !DILocalVariable(name: "offset_ptr"
+
+define void @"?foo@@YAXPEAUS@@_J@Z"(%struct.S* %ptr, i64 %offset) !dbg !8 {
+entry:
+  call void @llvm.dbg.value(metadata i64 %offset, metadata !20, metadata !DIExpression()), !dbg !24
+  call void @llvm.dbg.value(metadata %struct.S* %ptr, metadata !21, metadata !DIExpression()), !dbg !24
+  %arrayidx = getelementptr inbounds %struct.S, %struct.S* %ptr, i64 %offset, !dbg !25
+  %b = getelementptr inbounds %struct.S, %struct.S* %arrayidx, i32 0, i32 1, !dbg !25
+  call void @llvm.dbg.value(metadata i32* %b, metadata !22, metadata !DIExpression()), !dbg !24
+  ret void, !dbg !26
+}
+
+declare void @llvm.dbg.value(metadata, metadata, metadata)
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5, !6}
+!llvm.ident = !{!7}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "salvage-gep.cpp", directory: "/")
+!2 = !{}
+!3 = !{i32 2, !"CodeView", i32 1}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 2}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{!"clang version 11.0.0"}
+!8 = distinct !DISubprogram(name: "foo", linkageName: "?foo@@YAXPEAUS@@_J@Z", scope: !9, file: !9, line: 7, type: !10, scopeLine: 7, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !19)
+!9 = !DIFile(filename: ".\\salvage-gep.cpp", directory: "/")
+!10 = !DISubroutineType(types: !11)
+!11 = !{null, !12, !18}
+!12 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !9, line: 2, size: 64, flags: DIFlagTypePassByValue, elements: !14, identifier: ".?AUS@@")
+!14 = !{!15, !17}
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !9, line: 3, baseType: !16, size: 32)
+!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !13, file: !9, line: 4, baseType: !16, size: 32, offset: 32)
+!18 = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed)
+!19 = !{!20, !21, !22}
+!20 = !DILocalVariable(name: "offset", arg: 2, scope: !8, file: !9, line: 7, type: !18)
+!21 = !DILocalVariable(name: "ptr", arg: 1, scope: !8, file: !9, line: 7, type: !12)
+!22 = !DILocalVariable(name: "offset_ptr", scope: !8, file: !9, line: 8, type: !23)
+!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!24 = !DILocation(line: 0, scope: !8)
+!25 = !DILocation(line: 8, scope: !8)
+!26 = !DILocation(line: 9, scope: !8)

llvm/test/DebugInfo/salvage-nonconst-binop.ll

+; RUN: opt %s -dce -S | FileCheck %s
+
+; Tests the salvaging of binary operators that use more than one non-constant
+; SSA value.
+
+; CHECK: call void @llvm.dbg.value(metadata !DIArgList(i32 %a, i32 %b),
+; CHECK-SAME: ![[VAR_C:[0-9]+]],
+; CHECK-SAME: !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_plus, DW_OP_stack_value))
+
+; CHECK: ![[VAR_C]] = !DILocalVariable(name: "c"
+
+define i32 @"?multiply@@YAHHH@Z"(i32 %a, i32 %b) !dbg !8 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %b, metadata !12, metadata !DIExpression()), !dbg !13
+  call void @llvm.dbg.value(metadata i32 %a, metadata !14, metadata !DIExpression()), !dbg !13
+  %add = add nsw i32 %a, %b, !dbg !15
+  call void @llvm.dbg.value(metadata i32 %add, metadata !16, metadata !DIExpression()), !dbg !13
+  %mul = mul nsw i32 %a, %b, !dbg !17
+  ret i32 %mul, !dbg !17
+}
+
+declare void @llvm.dbg.value(metadata, metadata, metadata)
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5, !6}
+!llvm.ident = !{!7}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.cpp", directory: "/")
+!2 = !{}
+!3 = !{i32 2, !"CodeView", i32 1}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 2}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{!"clang version 11.0.0"}
+!8 = distinct !DISubprogram(name: "multiply", linkageName: "?multiply@@YAHHH@Z", scope: !1, file: !1, line: 1, type: !9, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!9 = !DISubroutineType(types: !10)
+!10 = !{!11, !11, !11}
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DILocalVariable(name: "b", arg: 2, scope: !8, file: !1, line: 1, type: !11)
+!13 = !DILocation(line: 0, scope: !8)
+!14 = !DILocalVariable(name: "a", arg: 1, scope: !8, file: !1, line: 1, type: !11)
+!15 = !DILocation(line: 2, scope: !8)
+!16 = !DILocalVariable(name: "c", scope: !8, file: !1, line: 2, type: !11)
+!17 = !DILocation(line: 3, scope: !8)

llvm/test/Transforms/Reassociate/undef_intrinsics_when_deleting_instructions.ll

 ; RUN: opt < %s -reassociate -S | FileCheck %s
 
 ; Check that reassociate pass now undefs debug intrinsics that reference a value
 ; that gets dropped and cannot be salvaged.
 
-define hidden i32 @main() local_unnamed_addr {
-entry:
-  %foo = alloca i32, align 4, !dbg !20
-  %foo.0.foo.0..sroa_cast = bitcast i32* %foo to i8*, !dbg !20
-  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %foo.0.foo.0..sroa_cast), !dbg !20
-  store volatile i32 4, i32* %foo, align 4, !dbg !20, !tbaa !21
-  %foo.0.foo.0. = load volatile i32, i32* %foo, align 4, !dbg !25, !tbaa !21
-  %foo.0.foo.0.15 = load volatile i32, i32* %foo, align 4, !dbg !27, !tbaa !21
-  %foo.0.foo.0.16 = load volatile i32, i32* %foo, align 4, !dbg !28, !tbaa !21
-  ; CHECK-NOT: %add = add nsw i32 %foo.0.foo.0., %foo.0.foo.0.15
-  %add = add nsw i32 %foo.0.foo.0., %foo.0.foo.0.15, !dbg !29
-  ; CHECK: call void @llvm.dbg.value(metadata i32 undef, metadata [[VAR_A:![0-9]+]], metadata !DIExpression())
-  call void @llvm.dbg.value(metadata i32 %add, metadata !19, metadata !DIExpression()), !dbg !26
-  %foo.0.foo.0.17 = load volatile i32, i32* %foo, align 4, !dbg !30, !tbaa !21
-  %cmp = icmp eq i32 %foo.0.foo.0.17, 4, !dbg !30
-  br i1 %cmp, label %if.then, label %if.end, !dbg !32
+; CHECK-NOT: %add = fadd fast float %a, %b
+; CHECK: call void @llvm.dbg.value(metadata float undef, metadata [[VAR_X:![0-9]+]], metadata !DIExpression())
 
-  ; CHECK-LABEL: if.then:
-if.then:
-  ; CHECK-NOT: %add1 = add nsw i32 %add, %foo.0.foo.0.16
-  %add1 = add nsw i32 %add, %foo.0.foo.0.16, !dbg !33
-  ; CHECK: call void @llvm.dbg.value(metadata i32 undef, metadata [[VAR_A]], metadata !DIExpression())
-  call void @llvm.dbg.value(metadata i32 %add1, metadata !19, metadata !DIExpression()), !dbg !26
-  ; CHECK: call void @llvm.dbg.value(metadata i32 undef, metadata [[VAR_CHEESE:![0-9]+]], metadata !DIExpression())
-  call void @llvm.dbg.value(metadata i32 %add, metadata !18, metadata !DIExpression()), !dbg !26
-  %sub = add nsw i32 %add, -12, !dbg !34
-  %sub3 = sub nsw i32 %add1, %sub, !dbg !34
-  %mul = mul nsw i32 %sub3, 20, !dbg !36
-  %div = sdiv i32 %mul, 3, !dbg !37
-  br label %if.end, !dbg !38
-
-if.end:
-  %a.0 = phi i32 [ %div, %if.then ], [ 0, %entry ], !dbg !39
-  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %foo.0.foo.0..sroa_cast), !dbg !40
-  ret i32 %a.0, !dbg !41
+; CHECK-NOT: %add1 = fadd fast float %add, %c
+; CHECK: call void @llvm.dbg.value(metadata float undef, metadata [[VAR_Y:![0-9]+]], metadata !DIExpression())
+; CHECK: [[VAR_Y]] = !DILocalVariable(name: "y"
+; CHECK-DAG: [[VAR_X]] = !DILocalVariable(name: "x"
+
+define float @"?foo@@YAMMMMM@Z"(float %a, float %b, float %c, float %d) !dbg !8 {
+entry:
+  call void @llvm.dbg.value(metadata float %d, metadata !12, metadata !DIExpression()), !dbg !13
+  call void @llvm.dbg.value(metadata float %c, metadata !14, metadata !DIExpression()), !dbg !13
+  call void @llvm.dbg.value(metadata float %b, metadata !15, metadata !DIExpression()), !dbg !13
+  call void @llvm.dbg.value(metadata float %a, metadata !16, metadata !DIExpression()), !dbg !13
+  %add = fadd fast float %a, %b, !dbg !17
+  call void @llvm.dbg.value(metadata float %add, metadata !18, metadata !DIExpression()), !dbg !13
+  %cmp = fcmp fast oeq float %d, 4.000000e+00, !dbg !19
+  br i1 %cmp, label %if.then, label %return, !dbg !19
+
+if.then:                                          ; preds = %entry
+  %add1 = fadd fast float %add, %c, !dbg !20
+  call void @llvm.dbg.value(metadata float %add1, metadata !23, metadata !DIExpression()), !dbg !24
+  %sub = fsub fast float %add, 1.200000e+01, !dbg !25
+  %sub2 = fsub fast float %add1, %sub, !dbg !25
+  %mul = fmul fast float %sub2, 2.000000e+01, !dbg !25
+  %div = fdiv fast float %mul, 3.000000e+00, !dbg !25
+  br label %return, !dbg !25
+
+return:                                           ; preds = %entry, %if.then
+  %retval.0 = phi float [ %div, %if.then ], [ 0.000000e+00, %entry ], !dbg !13
+  ret float %retval.0, !dbg !26
 }
 
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
-declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+declare void @llvm.dbg.value(metadata, metadata, metadata)
 
 !llvm.dbg.cu = !{!0}
 !llvm.module.flags = !{!3, !4, !5, !6}
 !llvm.ident = !{!7}
 
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, debugInfoForProfiling: true, nameTableKind: None)
-!1 = !DIFile(filename: "test.cpp", directory: "F:\")
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "undef_intrinsics_when_deleting_instructions.cpp", directory: "/")
 !2 = !{}
-!3 = !{i32 2, !"Dwarf Version", i32 4}
+!3 = !{i32 2, !"CodeView", i32 1}
 !4 = !{i32 2, !"Debug Info Version", i32 3}
 !5 = !{i32 1, !"wchar_size", i32 2}
 !6 = !{i32 7, !"PIC Level", i32 2}
-!7 = !{!"clang version 10.0.0"}
-!8 = distinct !DISubprogram(name: "main", scope: !9, file: !9, line: 1, type: !10, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !13)
-!9 = !DIFile(filename: "./test.cpp", directory: "F:\")
-!10 = !DISubroutineType(types: !11)
-!11 = !{!12}
-!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!13 = !{!14, !16, !17, !18, !19}
-!14 = !DILocalVariable(name: "foo", scope: !8, file: !9, line: 2, type: !15)
-!15 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !12)
-!16 = !DILocalVariable(name: "read1", scope: !8, file: !9, line: 3, type: !12)
-!17 = !DILocalVariable(name: "read2", scope: !8, file: !9, line: 4, type: !12)
-; CHECK: [[VAR_CHEESE]] = !DILocalVariable(name: "cheese"
-!18 = !DILocalVariable(name: "cheese", scope: !8, file: !9, line: 6, type: !12)
-; CHECK: [[VAR_A]] = !DILocalVariable(name: "a"
-!19 = !DILocalVariable(name: "a", scope: !8, file: !9, line: 7, type: !12)
-!20 = !DILocation(line: 2, scope: !8)
-!21 = !{!22, !22, i64 0}
-!22 = !{!"int", !23, i64 0}
-!23 = !{!"omnipotent char", !24, i64 0}
-!24 = !{!"Simple C++ TBAA"}
-!25 = !DILocation(line: 3, scope: !8)
-!26 = !DILocation(line: 0, scope: !8)
-!27 = !DILocation(line: 4, scope: !8)
-!28 = !DILocation(line: 6, scope: !8)
-!29 = !DILocation(line: 7, scope: !8)
-!30 = !DILocation(line: 10, scope: !31)
-!31 = distinct !DILexicalBlock(scope: !8, file: !9, line: 10)
-!32 = !DILocation(line: 10, scope: !8)
-!33 = !DILocation(line: 8, scope: !8)
-!34 = !DILocation(line: 12, scope: !35)
-!35 = distinct !DILexicalBlock(scope: !31, file: !9, line: 10)
-!36 = !DILocation(line: 13, scope: !35)
-!37 = !DILocation(line: 14, scope: !35)
-!38 = !DILocation(line: 15, scope: !35)
-!39 = !DILocation(line: 0, scope: !31)
-!40 = !DILocation(line: 20, scope: !8)
-!41 = !DILocation(line: 19, scope: !8)
+!7 = !{!"clang version 11.0.0"}
+!8 = distinct !DISubprogram(name: "foo", linkageName: "?foo@@YAMMMMM@Z", scope: !1, file: !1, line: 1, type: !9, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!9 = !DISubroutineType(types: !10)
+!10 = !{!11, !11, !11, !11, !11}
+!11 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
+!12 = !DILocalVariable(name: "d", arg: 4, scope: !8, file: !1, line: 1, type: !11)
+!13 = !DILocation(line: 0, scope: !8)
+!14 = !DILocalVariable(name: "c", arg: 3, scope: !8, file: !1, line: 1, type: !11)
+!15 = !DILocalVariable(name: "b", arg: 2, scope: !8, file: !1, line: 1, type: !11)
+!16 = !DILocalVariable(name: "a", arg: 1, scope: !8, file: !1, line: 1, type: !11)
+!17 = !DILocation(line: 2, scope: !8)
+!18 = !DILocalVariable(name: "x", scope: !8, file: !1, line: 2, type: !11)
+!19 = !DILocation(line: 3, scope: !8)
+!20 = !DILocation(line: 4, scope: !21)
+!21 = distinct !DILexicalBlock(scope: !22, file: !1, line: 3)
+!22 = distinct !DILexicalBlock(scope: !8, file: !1, line: 3)
+!23 = !DILocalVariable(name: "y", scope: !21, file: !1, line: 4, type: !11)
+!24 = !DILocation(line: 0, scope: !21)
+!25 = !DILocation(line: 5, scope: !21)
+!26 = !DILocation(line: 8, scope: !8)