https://github.com/xlauko approved this pull request. lgtm, nit you can also now pass `builder` directy, that is already present in the scope, into the functions instead of `cgf` just to use it for `cgf.getBuilder()` https://github.com/llvm/llvm-project/pull/169586