I committed revisions 172504 and 172505 to google/gcc-4_6 Rev 172504 merges all the changes from gcc-4_6-branch since the 4.6.0 release.
Rev 172505 is the following release-only fix from Le-Chun that fixes annotalysis conflicts with new constexpr changes in the parser: 2011-04-15 Le-Chun Wu <l...@google.com> * decl2.c (cp_check_const_attributes): Handle unparsed lock attribute arguments. * parser.c (cp_parser_attribute_list): Don't save tokens when argument list of a lock attribute is empty. * semantics.c (cxx_eval_constant_expression): Handle unexpected FIELD_DECL gracefully. I committed the two changes separately to simplify cherry picking of Le-Chun's fix for trunk (the patch cannot be applied to google/main). Tested on x86_64. Diego.
