Compute a better lint_node_id during expansion
#87146
Merged
lint_node_id during expansion
#87146