DiagnosticOptions
This reverts commit e2a885537f11f8d9ced1c80c2c90069ab5adeb1d. Build failures were fixed right away and reverting the original commit without the fixes breaks the build again.
CXXOperatorCallExpr
->
TargetOptions
CompilerInvocation