swift

Adjust to some low-risk upstream llvm-project changes

#91251

Merged