Skip to content

Commit

Permalink
[clang][Interp] Lazily visit unknown global declarations
Browse files Browse the repository at this point in the history
In C, we don't get a evaluateAsInitializer() call for all global
declarations, yet we have to handle DeclRefExpr pointing to them.

Differential Revision: https://reviews.llvm.org/D156794
  • Loading branch information
tbaederr committed Sep 15, 2023
1 parent 7b03a55 commit 6d73cca
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
11 changes: 11 additions & 0 deletions clang/lib/AST/Interp/ByteCodeExprGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2459,6 +2459,17 @@ bool ByteCodeExprGen<Emitter>::VisitDeclRefExpr(const DeclRefExpr *E) {
return this->emitGetPtrThisField(Offset, E);
}

// Lazily visit global declarations we haven't seen yet.
// This happens in C.
if (!Ctx.getLangOpts().CPlusPlus) {
if (const auto *VD = dyn_cast<VarDecl>(D);
VD && VD->hasGlobalStorage() && VD->getAnyInitializer()) {
if (!this->visitVarDecl(VD))
return false;
// Retry.
return this->VisitDeclRefExpr(E);
}
}
return false;
}

Expand Down
15 changes: 13 additions & 2 deletions clang/test/AST/Interp/c.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -verify %s
// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -pedantic -verify=pedantic-expected %s
// RUN: %clang_cc1 -verify=ref %s
// RUN: %clang_cc1 -pedantic -verify=pedantic-ref %s

/// expected-no-diagnostics
/// ref-no-diagnostics

_Static_assert(1, "");
_Static_assert(0 != 1, "");
_Static_assert(1.0 == 1.0, "");
_Static_assert(1.0 == 1.0, ""); // pedantic-ref-warning {{not an integer constant expression}} \
// pedantic-expected-warning {{not an integer constant expression}}
_Static_assert( (5 > 4) + (3 > 2) == 2, "");

/// FIXME: Should also be rejected in the new interpreter
int a = (1 == 1 ? 5 : 3);
_Static_assert(a == 5, ""); // ref-error {{not an integral constant expression}} \
// pedantic-ref-error {{not an integral constant expression}} \
// pedantic-expected-warning {{not an integer constant expression}}

const int b = 3;
_Static_assert(b == 3, ""); // pedantic-ref-warning {{not an integer constant expression}} \
// pedantic-expected-warning {{not an integer constant expression}}

0 comments on commit 6d73cca

Please sign in to comment.