Always interested if I can learn something new.
Okay then, geek alert
I did these tests a few years ago, hence not the best cameras available today but more than good enough for this. I use Imatest MTF
http://www.imatest.com/
This is one lens, Sigma 35/1.4 Art, tested on three cameras with pixel counts of 21mp (Canon 5D2), 46mp (Canon 7D, full-frame equivalent), and 74mp (Nikon V1, FF equiv, via lens adapter). Test images are all from the centre of the frame, and are output as % MTF contrast (vertical axis) at resolutions of 30 lines-per-mm on the top three traces, and 48 lpmm on the bottom three. The difference between 30 and 48 is 1.6x crop factor.
The graph shows a number of things, but in relation to this thread and diffraction, it clearly shows that sharpness improves with more pixels, throughout the aperture range to f/16. It also shows how diffraction hurts smaller formats more - the bottom three traces decline at a faster rate after the peak. If this is taken further, much further with say a smartphone sensor's miniscule sensor/pixels, then not only does diffraction hit harder, but much sooner too. Correspondingly, some smartphones and small-sensor compacts use ND filters to control brightness rather than lens aperture as the diffraction effects even at f/2.8 are unacceptable.
Other points of interest, by testing at a set resolution (much better and more relevant than fixed contrast MTF50 that most lens testers use) it's easily possible to adjust by the crop factor and show exactly how the same lens performs on different formats. Note how the third trace down at 21mp on full-frame, is substantially better than anything on 1.6x crop format, even on a sensor with almost 4x the number of pixels (fourth trace down). For sharpness, bigger formats always win - because of the higher contrast delivered at the lower magnification they work at.
The law of diminishing returns - there's a big difference between 21mp and 46mp, but the jump up to 74mp yields much less improvement. While that's certainly true, the exact difference may be hidden/reduced by the AA filters which all these cameras have (of unknown strength). This really needs a retest on cameras without AA filters that are available now, but reading between the lines (haha) there may be evidence that the AA filter on the Canon 7D is capping peak sharpness slightly.
This Sigma 35/1.4 Art is a very sharp lens, peaking around f/2.8 to f/4 and diffraction-limited after that. Less sharp lenses peak later (maybe at f/5.6-8 in the centre, typically at higher f/numbers towards the edges that are more to aberrations) and at a lower level, but once diffraction cuts in they're all the same by f/11-16.
Ignore the dogleg at f/11 on the 7D. Pretty sure that's just a software sampling error that has bumped the percentage contrast by about 5% but by the time I realised this I'd packed everything away and found out what I needed to know. And that was, how many pixels do you need to max out the best lenses, before throwing any more at it makes no noticeable difference? With the caveat re AA filters, I'd reckon this is probably around 80mp (on FF), and that's in highly controlled and optimised tests like this. But I'll also offer this observation - a difference of 5% MTF is quite hard to discern, even at high magnification - you need more like 10% before it gets noticeable.
Now the Imatest MTF process uses quite small target areas dotted over the frame, but only needs one (a dark square on a light background, about the size of a playing card) to generate data. So you can cut out just one and position it in a scene, or even pin it to a moving subject and, given suitable lighting conditions, take a very accurate MTF sharpness reading directly from real world images. And that's where you get a shock - with all the variables of actual picture taking (eg focusing errors, camera-shake, subject movement, pixel counts, high ISO, viewing limitations etc etc) you can get pictures that look very sharp indeed but check out at maybe 20% below the potential maximum.
In the field, maxing out a really good camera/lens is bluddy hard, and frankly you rarely need to for excellent results. So bringing this full circle, diffraction is real and can really hurt
peak sharpness, but if you stay away from the highest f/numbers you'll be probably be fine and paying closer attention to other aspects of technique are more important. Diffraction varies with format and FWIW, I try not to go above f/11 on full frame though f/16 is usually okay. On APS-C crop format, that translates to f/8-11, and on M4/3 f/5.6-8.