[clang] [clang][bytecode] Simplify diagnoseUnknownDecl if we're not diagnosing (PR #141910)
Timm Baeder via cfe-commits
cfe-commits at lists.llvm.org
Thu May 29 01:02:02 PDT 2025
https://github.com/tbaederr created https://github.com/llvm/llvm-project/pull/141910
See the added comment.
This improves compile times a bit:
https://llvm-compile-time-tracker.com/compare.php?from=ac62f73f19ae9fb415d3fc423949b8d7543e8717&to=0d6cf47197a4ee11cdd1ee4a48ea38a2907c3d45&stat=instructions:u
>From 756616defbb15dd4975f61759e8a48ab3f7cdcf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder at redhat.com>
Date: Wed, 28 May 2025 13:45:06 +0200
Subject: [PATCH] [clang][bytecode] Simplify diagnoseUnknownDecl if we're not
diagnosing
See the added comment.
This improves compile times a bit:
https://llvm-compile-time-tracker.com/compare.php?from=ac62f73f19ae9fb415d3fc423949b8d7543e8717&to=0d6cf47197a4ee11cdd1ee4a48ea38a2907c3d45&stat=instructions:u
---
clang/lib/AST/ByteCode/Interp.cpp | 7 +++++++
clang/lib/AST/ByteCode/InterpBuiltin.cpp | 3 +++
clang/lib/AST/ByteCode/InterpState.h | 2 ++
3 files changed, 12 insertions(+)
diff --git a/clang/lib/AST/ByteCode/Interp.cpp b/clang/lib/AST/ByteCode/Interp.cpp
index e454d9e3bc218..a8514a7ac4418 100644
--- a/clang/lib/AST/ByteCode/Interp.cpp
+++ b/clang/lib/AST/ByteCode/Interp.cpp
@@ -136,6 +136,10 @@ static void diagnoseNonConstVariable(InterpState &S, CodePtr OpPC,
const ValueDecl *VD);
static bool diagnoseUnknownDecl(InterpState &S, CodePtr OpPC,
const ValueDecl *D) {
+ // This function tries pretty hard to produce a good diagnostic. Just skip
+ // tha if nobody will see it anyway.
+ if (!S.diagnosing())
+ return false;
if (isa<ParmVarDecl>(D)) {
if (D->getType()->isReferenceType())
@@ -168,6 +172,9 @@ static bool diagnoseUnknownDecl(InterpState &S, CodePtr OpPC,
static void diagnoseNonConstVariable(InterpState &S, CodePtr OpPC,
const ValueDecl *VD) {
+ if (!S.diagnosing())
+ return;
+
const SourceInfo &Loc = S.Current->getSource(OpPC);
if (!S.getLangOpts().CPlusPlus) {
S.FFDiag(Loc);
diff --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
index 8edc6248dcbfd..9d33030aad15a 100644
--- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp
+++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
@@ -152,6 +152,9 @@ static QualType getElemType(const Pointer &P) {
static void diagnoseNonConstexprBuiltin(InterpState &S, CodePtr OpPC,
unsigned ID) {
+ if (!S.diagnosing())
+ return;
+
auto Loc = S.Current->getSource(OpPC);
if (S.getLangOpts().CPlusPlus11)
S.CCEDiag(Loc, diag::note_constexpr_invalid_function)
diff --git a/clang/lib/AST/ByteCode/InterpState.h b/clang/lib/AST/ByteCode/InterpState.h
index 91e09a911ce37..e8dc6f0483d60 100644
--- a/clang/lib/AST/ByteCode/InterpState.h
+++ b/clang/lib/AST/ByteCode/InterpState.h
@@ -53,6 +53,8 @@ class InterpState final : public State, public SourceMapper {
InterpState(const InterpState &) = delete;
InterpState &operator=(const InterpState &) = delete;
+ bool diagnosing() const { return getEvalStatus().Diag != nullptr; }
+
// Stack frame accessors.
Frame *getSplitFrame() { return Parent.getCurrentFrame(); }
Frame *getCurrentFrame() override;
More information about the cfe-commits
mailing list