[clang] Revert "[clang] Fix handle_cxx.cpp after 9e306ad4" (PR #141532)

[Walter Lee via cfe-commits]

https://github.com/googlewalt created https://github.com/llvm/llvm-project/pull/141532

This reverts commit d25f95fdbc5314f30618912e18f00ad4dd720fa0, after 9e306ad4 was rolled back in e2a88553 (r576388).

>From 95dc425f757d1f0a895612bca6aaf8e80f44cf9e Mon Sep 17 00:00:00 2001
From: Walter Lee <waltl at google.com>
Date: Mon, 26 May 2025 16:58:34 -0400
Subject: [PATCH] Revert "[clang] Fix handle_cxx.cpp after 9e306ad4"

This reverts commit d25f95fdbc5314f30618912e18f00ad4dd720fa0, after
9e306ad4 was rolled back in e2a88553 (r576388).
---
 clang/tools/clang-fuzzer/handle-cxx/handle_cxx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang/tools/clang-fuzzer/handle-cxx/handle_cxx.cpp b/clang/tools/clang-fuzzer/handle-cxx/handle_cxx.cpp
index 98925c00260f1..14204021d262b 100644
--- a/clang/tools/clang-fuzzer/handle-cxx/handle_cxx.cpp
+++ b/clang/tools/clang-fuzzer/handle-cxx/handle_cxx.cpp
@@ -32,9 +32,9 @@ void clang_fuzzer::HandleCXX(const std::string &S,
   llvm::IntrusiveRefCntPtr<FileManager> Files(
       new FileManager(FileSystemOptions()));
   IgnoringDiagConsumer Diags;
-  DiagnosticOptions DiagOpts;
+  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
   DiagnosticsEngine Diagnostics(
-      IntrusiveRefCntPtr<clang::DiagnosticIDs>(new DiagnosticIDs()), DiagOpts,
+      IntrusiveRefCntPtr<clang::DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
       &Diags, false);
   std::unique_ptr<clang::CompilerInvocation> Invocation(
       tooling::newInvocation(&Diagnostics, CC1Args, /*BinaryName=*/nullptr));