uid_of_path can use the decl_id if shapes fail (#1700)

uid_of_path can use the decl_id if shapes fail (#1700) #1820