diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2024-03-10 12:37:50 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-04-19 21:24:47 +0000 |
| commit | b09953d54d755297cf5c14f69c315bd4148d4153 (patch) | |
| tree | 36f2041c29f90e8983b9b18584cc0c6ae5abebaa /contrib/llvm-project/clang/include/clang/Sema/Sema.h | |
| parent | 7032a435215851c26dbcef63f5a4d1c1526e9ab9 (diff) | |
| download | src-b09953d54d755297cf5c14f69c315bd4148d4153.tar.gz src-b09953d54d755297cf5c14f69c315bd4148d4153.zip | |
Merge llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e.
PR: 276104
MFC after: 1 month
(cherry picked from commit 4c2d3b022a1d543dbbff75a0c53e8d3d7242216d)
Diffstat (limited to 'contrib/llvm-project/clang/include/clang/Sema/Sema.h')
| -rw-r--r-- | contrib/llvm-project/clang/include/clang/Sema/Sema.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/llvm-project/clang/include/clang/Sema/Sema.h b/contrib/llvm-project/clang/include/clang/Sema/Sema.h index 1f1cbd11ff73..6adb8fb7966b 100644 --- a/contrib/llvm-project/clang/include/clang/Sema/Sema.h +++ b/contrib/llvm-project/clang/include/clang/Sema/Sema.h @@ -1090,7 +1090,9 @@ public: if (FD) { FD->setWillHaveBody(true); S.ExprEvalContexts.back().InImmediateFunctionContext = - FD->isImmediateFunction(); + FD->isImmediateFunction() || + S.ExprEvalContexts[S.ExprEvalContexts.size() - 2] + .isConstantEvaluated(); S.ExprEvalContexts.back().InImmediateEscalatingFunctionContext = S.getLangOpts().CPlusPlus20 && FD->isImmediateEscalating(); } else |