Pick up latest field changes from gcc.godbolt.org