https://github.com/kito-cheng commented: Does AddressMap part is necessary for this patch? I feel that could be a separated PR and having a testcase to demonstrate what issue got fixed? https://github.com/llvm/llvm-project/pull/207733