llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/110673.diff 2 Files Affected: - (modified) clang/lib/AST/ByteCode/Interp.h (+5-4) - (modified) clang/test/AST/ByteCode/records.cpp (+8) ``````````diff diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h index 8a3c6810e0e11b..5c3ee5e689f1c3 100644 --- a/clang/lib/AST/ByteCode/Interp.h +++ b/clang/lib/AST/ByteCode/Interp.h @@ -1641,14 +1641,14 @@ inline bool GetPtrDerivedPop(InterpState &S, CodePtr OpPC, uint32_t Off) { inline bool GetPtrBase(InterpState &S, CodePtr OpPC, uint32_t Off) { const Pointer &Ptr = S.Stk.peek<Pointer>(); + if (!CheckNull(S, OpPC, Ptr, CSK_Base)) + return false; if (!Ptr.isBlockPointer()) { S.Stk.push<Pointer>(Ptr.asIntPointer().baseCast(S.getASTContext(), Off)); return true; } - if (!CheckNull(S, OpPC, Ptr, CSK_Base)) - return false; if (!CheckSubobject(S, OpPC, Ptr, CSK_Base)) return false; const Pointer &Result = Ptr.atField(Off); @@ -1661,13 +1661,14 @@ inline bool GetPtrBase(InterpState &S, CodePtr OpPC, uint32_t Off) { inline bool GetPtrBasePop(InterpState &S, CodePtr OpPC, uint32_t Off) { const Pointer &Ptr = S.Stk.pop<Pointer>(); + if (!CheckNull(S, OpPC, Ptr, CSK_Base)) + return false; + if (!Ptr.isBlockPointer()) { S.Stk.push<Pointer>(Ptr.asIntPointer().baseCast(S.getASTContext(), Off)); return true; } - if (!CheckNull(S, OpPC, Ptr, CSK_Base)) - return false; if (!CheckSubobject(S, OpPC, Ptr, CSK_Base)) return false; const Pointer &Result = Ptr.atField(Off); diff --git a/clang/test/AST/ByteCode/records.cpp b/clang/test/AST/ByteCode/records.cpp index 7e3cf5b94518f7..215f26bd5da8ea 100644 --- a/clang/test/AST/ByteCode/records.cpp +++ b/clang/test/AST/ByteCode/records.cpp @@ -1653,3 +1653,11 @@ namespace ExprWithCleanups { constexpr auto F = true ? 1i : 2i; static_assert(F == 1i, ""); } + +namespace NullptrUpcast { + struct A {}; + struct B : A { int n; }; + constexpr B *nb = nullptr; + constexpr A &ra = *nb; // both-error {{constant expression}} \ + // both-note {{cannot access base class of null pointer}} +} `````````` </details> https://github.com/llvm/llvm-project/pull/110673 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
