Separate DefIds for variants and their constructors
#59382
Merged
DefIds for variants and their constructors
#59382