Split join_codegen_and_link() into two steps
#68601
+55
−28
Merged