[cfe-commits] [Patch 2 of 4] -verify fixes (stage 2)

[Jordan Rose]

On Aug 8, 2012, at 11:13 PM, Andy Gibbs <andyg1001 at hotmail.co.uk> wrote:

> On Thursday, August 09, 2012 3:07 AM, Jordan Rose wrote:
>> Hm. This doesn't feel right either, because at this point errRec is no
>> longer the actual client hooked up to DiagnosticsEngine. I guess the
>> nested begin/end is a better way to go.
> 
> As you wish, but errRec is the wrapper around the actual client and is the
> diagnostic client in use while the diagnostics are generated.  But I also
> prefer the nested approach since it is cleaner and is not necessarily in
> conflict with the perceived intention behind the Begin/EndSourceFile calls,
> in my opinion.

All patches finally committed in r161649 (0) and r161650 (1-4)...except I ended up not making the ASTMerge change. Right now ASTMerge always has a preprocessor, but I feel like there's no reason to require that in the future -- the AST file isn't going to be preprocessed. Instead, I just made VerifyDiagnosticsConsumer a bit more forgiving about having a nested Begin/End pair with no preprocessor.

Thanks again for all the work!
Jordan