Multi-decl rewriting loses macro in base type of variable whose type did not change

[mattmccutchen-cci]

PointerVariableConstraint::extractBaseType tries to use the base type as it was originally written in the source (to preserve any macros), but the code path in rewriteMultiDecl for variables after the first whose type hasn't changed does not: it uses Decl::print, which reconstructs the declaration from the AST, losing any macros. So running 3C on the following input (a variation of our actual definedType.c test):

#define my_ulong unsigned long

my_ulong *p, x;

gives:

#define my_ulong unsigned long

_Ptr<my_ulong> p = ((void *)0);
unsigned long x;

Ideally, 3C would somehow keep the macro in x.

This issue is probably low priority, but I thought I would file it anyway in case anyone has thoughts to add.

[john-h-kastner]

Something like this would probably work:

• For pointer types that aren't rewritten, get the PointerVariableConstraint and rewrite using that instead. It should be perfectly happy to emit the fully unchecked type.
• For non-pointer types, extractBaseType is static in PointerVariableConstraint, so it could be moved to Utils.cpp and called to find the type.

[mattmccutchen-cci]

It looks like there's another reason why I'm going to have to change rewriteMultiDecl to always use the form of the base type that originally came from PointerVariableConstraint::extractBaseType: if the base type is an unnamed inline struct to which I've assigned a name, I need to use the new name. On my branch, I've extended PointerVariableConstraint::extractBaseType to use the new name, but it seems awkward at best to modify the Decl::print code path to do the same thing. So thanks John for the suggestions! Hopefully the same change will solve the issue with macros too.