From 79b973d819d6daf9175600e9529b004533c12fdf Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Fri, 21 Feb 2025 22:04:41 +1300
Subject: [PATCH] [cheriot] Fix clang crash after clang-18 merge

---
 clang/lib/Sema/SemaOverload.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 8b2e43d111247..83003428c42d9 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -5800,19 +5800,11 @@ ExprResult Sema::PerformImplicitObjectArgumentInitialization(
   if (const auto *FromPtrTy = From->getType()->getAs<PointerType>()) {
     const auto *ThisPtrTy = Method->getThisType()->getAs<PointerType>();
     if (ThisPtrTy->getPointerInterpretation() != FromPtrTy->getPointerInterpretation()) {
-      return Diag(From->getBeginLoc(), diag::err_sealed_this_pointer)
-            << From->getType() << From->getSourceRange();
+      Diag(From->getBeginLoc(), diag::err_sealed_this_pointer)
+          << From->getType() << From->getSourceRange();
     }
   }
 
-  const auto *ThisPtrTy = Method->getThisType()->getAs<PointerType>();
-  const auto *FromPtrTy = From->getType()->getAs<PointerType>();
-  if (FromPtrTy && ThisPtrTy->getPointerInterpretation() !=
-                       FromPtrTy->getPointerInterpretation()) {
-    return Diag(From->getBeginLoc(), diag::err_sealed_this_pointer)
-           << From->getType() << From->getSourceRange();
-  }
-
   Expr::Classification FromClassification;
   if (const PointerType *PT = From->getType()->getAs<PointerType>()) {
     FromRecordType = PT->getPointeeType();