Inline shallow_resolve_ty
into ShallowResolver
#95908
+39
−44
Merged