isuckatcs wrote: This change conflicted with #68039 and ended up crahing, which needed to be addressed. Please take a look at again when you have time @tbaederr. https://github.com/llvm/llvm-project/pull/67886