Jakub, The attached patch and ChangeLog reflects the updates from your review: https://gcc.gnu.org/ml/gcc-patches/2015-11/msg01002.html All of the issues you pointed out have been addressed. I've also added a test that uses C++ templates. A bug was also fixed in the parsers which dealt with determining which identifier to use with an attribute. Thanks! Jim