Author: Timm Baeder Date: 2024-10-09T20:00:33+02:00 New Revision: 208584d91ae138d752d89436e3df12fa8f2e60a8
URL: https://github.com/llvm/llvm-project/commit/208584d91ae138d752d89436e3df12fa8f2e60a8 DIFF: https://github.com/llvm/llvm-project/commit/208584d91ae138d752d89436e3df12fa8f2e60a8.diff LOG: [clang][bytecode] Fix source range of uncalled base dtor (#111683) Make this emit the same source range as the current interpreter. Added: Modified: clang/lib/AST/ByteCode/EvaluationResult.cpp clang/test/Misc/constexpr-subobj-init-source-ranges.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/EvaluationResult.cpp b/clang/lib/AST/ByteCode/EvaluationResult.cpp index 627d4b2f65be9d..c0d116cdf26c48 100644 --- a/clang/lib/AST/ByteCode/EvaluationResult.cpp +++ b/clang/lib/AST/ByteCode/EvaluationResult.cpp @@ -130,8 +130,9 @@ static bool CheckFieldsInitialized(InterpState &S, SourceLocation Loc, const Descriptor *Desc = BasePtr.getDeclDesc(); if (const auto *CD = dyn_cast_if_present<CXXRecordDecl>(R->getDecl())) { const auto &BS = *std::next(CD->bases_begin(), I); - S.FFDiag(BS.getBaseTypeLoc(), diag::note_constexpr_uninitialized_base) - << B.Desc->getType() << BS.getSourceRange(); + SourceLocation TypeBeginLoc = BS.getBaseTypeLoc(); + S.FFDiag(TypeBeginLoc, diag::note_constexpr_uninitialized_base) + << B.Desc->getType() << SourceRange(TypeBeginLoc, BS.getEndLoc()); } else { S.FFDiag(Desc->getLocation(), diag::note_constexpr_uninitialized_base) << B.Desc->getType(); diff --git a/clang/test/Misc/constexpr-subobj-init-source-ranges.cpp b/clang/test/Misc/constexpr-subobj-init-source-ranges.cpp index 342da2d8866687..990d1056d6d46e 100644 --- a/clang/test/Misc/constexpr-subobj-init-source-ranges.cpp +++ b/clang/test/Misc/constexpr-subobj-init-source-ranges.cpp @@ -1,4 +1,5 @@ // RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-print-source-range-info %s 2>&1 | FileCheck %s --strict-whitespace +// RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-print-source-range-info -fexperimental-new-constant-interpreter %s 2>&1 | FileCheck %s --strict-whitespace struct DelBase { constexpr DelBase() = delete; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
