When are those annotations enabled? By default they're turned off, would it make sense to turn them on by default? It seems like we're missing out on something interesting here.
But I don't have any objection with the patch itself.
It would be nice to have a test (in test/libcxx) to check that these annotations are in the expected places.
Ping @phosek . Are we doing this?