This set of patches to track locations of tokens access macro expansion was reviewed and accepted at http://gcc.gnu.org/ml/gcc-patches/2011-10/msg01346.html.
I have bootstrapped and tested it on x86_64-unknown-linux-gnu against trunk and I am checking it in now. Thanks.