Recommit [NFC] Refactor DiagnosticBuilder and PartialDiagnostic

This recommits 829d14ee.

The patch was reverted due to a regression in some CUDA app
which was thought to be caused by this patch. However, investigation
showed that the regression was due to some other issues, therefore
recommit this patch.