diff options
author | Timm Baeder <tbaeder@redhat.com> | 2025-05-13 10:55:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-05-13 10:55:24 +0200 |
commit | 98763433e66dd91bf5f10b1daf03d9373f07912a (patch) | |
tree | 36966237c6b2073578353242ec07b81b4c5445f6 | |
parent | 6d35ec233525f278cbe06ff3cd49ea276825817f (diff) | |
download | llvm-98763433e66dd91bf5f10b1daf03d9373f07912a.zip llvm-98763433e66dd91bf5f10b1daf03d9373f07912a.tar.gz llvm-98763433e66dd91bf5f10b1daf03d9373f07912a.tar.bz2 |
[clang][bytecode] Optimize enum value range checks (#139672)
Only do the work if we really have to.
-rw-r--r-- | clang/lib/AST/ByteCode/Interp.cpp | 5 | ||||
-rw-r--r-- | clang/lib/AST/ByteCode/Interp.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/AST/ByteCode/Interp.cpp b/clang/lib/AST/ByteCode/Interp.cpp index 43f8d15..91930c0 100644 --- a/clang/lib/AST/ByteCode/Interp.cpp +++ b/clang/lib/AST/ByteCode/Interp.cpp @@ -1251,12 +1251,11 @@ bool Free(InterpState &S, CodePtr OpPC, bool DeleteIsArrayForm, void diagnoseEnumValue(InterpState &S, CodePtr OpPC, const EnumDecl *ED, const APSInt &Value) { - llvm::APInt Min; - llvm::APInt Max; - if (S.EvaluatingDecl && !S.EvaluatingDecl->isConstexpr()) return; + llvm::APInt Min; + llvm::APInt Max; ED->getValueRange(Max, Min); --Max; diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h index a13fd6c..35d9716 100644 --- a/clang/lib/AST/ByteCode/Interp.h +++ b/clang/lib/AST/ByteCode/Interp.h @@ -3026,10 +3026,11 @@ template <PrimType Name, class T = typename PrimConv<Name>::T> inline bool CheckEnumValue(InterpState &S, CodePtr OpPC, const EnumDecl *ED) { assert(ED); assert(!ED->isFixed()); - const APSInt Val = S.Stk.peek<T>().toAPSInt(); - if (S.inConstantContext()) + if (S.inConstantContext()) { + const APSInt Val = S.Stk.peek<T>().toAPSInt(); diagnoseEnumValue(S, OpPC, ED, Val); + } return true; } |