As a heuristic, annotate tokens (via clang_annotateTokens) that are the...

As a heuristic, annotate tokens (via clang_annotateTokens) that are the arguments of a macro instantiation using the closest cursor with the same spelling location.  Because macro arguments can get token pasted in any arbitrary order, we use the annotation map to paper over the token -> cursor annotations during our post-processing stage.  This fixes most of <rdar://problem/8044584>, but still doesn't work for assert().

llvm-svn: 111062