Author: Timm Baeder Date: 2024-09-11T07:21:49+02:00 New Revision: d03822d8887adc9312e65abf8d8ce1a16007f2a0
URL: https://github.com/llvm/llvm-project/commit/d03822d8887adc9312e65abf8d8ce1a16007f2a0 DIFF: https://github.com/llvm/llvm-project/commit/d03822d8887adc9312e65abf8d8ce1a16007f2a0.diff LOG: [clang][bytecode] Fix lookup of source locations in implicit ctors (#107992) Implicit functions may still have a body. The !hasBody() check is enough. Added: Modified: clang/lib/AST/ByteCode/InterpFrame.cpp clang/test/AST/ByteCode/builtin-functions.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/InterpFrame.cpp b/clang/lib/AST/ByteCode/InterpFrame.cpp index 6830a7b37f1da5..28e189bb339e62 100644 --- a/clang/lib/AST/ByteCode/InterpFrame.cpp +++ b/clang/lib/AST/ByteCode/InterpFrame.cpp @@ -207,31 +207,40 @@ Pointer InterpFrame::getParamPointer(unsigned Off) { return Pointer(B); } +static bool funcHasUsableBody(const Function *F) { + assert(F); + + if (F->isConstructor() || F->isDestructor()) + return true; + + return !F->getDecl()->isImplicit(); +} + SourceInfo InterpFrame::getSource(CodePtr PC) const { // Implicitly created functions don't have any code we could point at, // so return the call site. - if (Func && (!Func->hasBody() || Func->getDecl()->isImplicit()) && Caller) + if (Func && !funcHasUsableBody(Func) && Caller) return Caller->getSource(RetPC); return S.getSource(Func, PC); } const Expr *InterpFrame::getExpr(CodePtr PC) const { - if (Func && (!Func->hasBody() || Func->getDecl()->isImplicit()) && Caller) - return Caller->getExpr(RetPC); + if (Func && !funcHasUsableBody(Func) && Caller) + return Caller->getExpr(PC); return S.getExpr(Func, PC); } SourceLocation InterpFrame::getLocation(CodePtr PC) const { - if (Func && (!Func->hasBody() || Func->getDecl()->isImplicit()) && Caller) + if (Func && !funcHasUsableBody(Func) && Caller) return Caller->getLocation(RetPC); return S.getLocation(Func, PC); } SourceRange InterpFrame::getRange(CodePtr PC) const { - if (Func && (!Func->hasBody() || Func->getDecl()->isImplicit()) && Caller) + if (Func && !funcHasUsableBody(Func) && Caller) return Caller->getRange(RetPC); return S.getRange(Func, PC); diff --git a/clang/test/AST/ByteCode/builtin-functions.cpp b/clang/test/AST/ByteCode/builtin-functions.cpp index 9c9ca23e0a6a69..9fd5eae67a21f6 100644 --- a/clang/test/AST/ByteCode/builtin-functions.cpp +++ b/clang/test/AST/ByteCode/builtin-functions.cpp @@ -968,3 +968,10 @@ namespace FunctionStart { static_assert(__builtin_function_start(a) == a, ""); // both-error {{not an integral constant expression}} \ // both-note {{comparison of addresses of literals has unspecified value}} } + +namespace BuiltinInImplicitCtor { + constexpr struct { + int a = __builtin_isnan(1.0); + } Foo; + static_assert(Foo.a == 0, ""); +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
