swift

b92530f5 - Merge pull request #67500 from ahoppen/ahoppen/accessor-refactoring