Skip to content

Commit

Permalink
[cling] DefinitionShadower: fix crash with C++20 concepts
Browse files Browse the repository at this point in the history
In principle, for a TemplateDecl, `isDefinition()` issues a recursive
call passing the templated decl as a parameter.  A `ConceptDecl` is
derived from `TemplateDecl`, however, it should always be considered
a definition.

Also, update the DeclShadowing test incorporating a C++20 concept.

Fixes root-project#12779.
  • Loading branch information
jalopezg-git committed May 7, 2023
1 parent 9e11b40 commit 9aad608
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
6 changes: 4 additions & 2 deletions interpreter/cling/lib/Interpreter/DefinitionShadower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ namespace cling {
&& (SM.getFileID(SM.getIncludeLoc(FID)) == SM.getMainFileID());
}

/// \brief Returns whether the given {Function,Tag,Var}Decl/TemplateDecl is a definition.
/// \brief Returns whether a declaration is a definition. A `TemplateDecl` is
/// a definition if the templated decl is itself a definition; a concept is
/// always considered a definition.
static bool isDefinition(const Decl *D) {
if (auto FD = dyn_cast<FunctionDecl>(D))
return FD->isThisDeclarationADefinition();
Expand All @@ -44,7 +46,7 @@ namespace cling {
if (auto VD = dyn_cast<VarDecl>(D))
return VD->isThisDeclarationADefinition();
if (auto TD = dyn_cast<TemplateDecl>(D))
return isDefinition(TD->getTemplatedDecl());
return isa<ConceptDecl>(TD) || isDefinition(TD->getTemplatedDecl());
return true;
}

Expand Down
19 changes: 17 additions & 2 deletions interpreter/cling/test/CodeUnloading/DeclShadowing.C
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@
// LICENSE.TXT for details.
//------------------------------------------------------------------------------

// RUN: cat %s | %cling 2>&1 | FileCheck %s
// RUN: cat %s | %cling 2>&1 | FileCheck --implicit-check-not error: %s
#include "cling/Interpreter/Interpreter.h"
#include "cling/Utils/AST.h"
#include "clang/AST/Decl.h"

#include <type_traits>
#if __cplusplus > 202002L
#include <concepts>
#endif
#include <cstdlib>
#include <string>
#include <type_traits>

unsigned _i;
struct _X {};
Expand Down Expand Up @@ -98,6 +101,18 @@ f(33)
f(3.3f)
//CHECK-NEXT: (int) 21930

#if __cplusplus > 202002L
template <typename T>
concept IsIntegral = false;

// Replace concept definition; no error is expected in `constrained_fn(10)` below
template <typename T>
concept IsIntegral = std::is_integral<T>::value;

void constrained_fn(IsIntegral auto x) {}
void g() { constrained_fn(10); }
#endif

cling::runtime::gClingOpts->AllowRedefinition = 0;

// ==== Check DeclContext
Expand Down

0 comments on commit 9aad608

Please sign in to comment.