Improve diagnostic output of non_local_definitions
lint
#125089
Merged
non_local_definitions
lint
#125089