Skip to content

[clang][Interp] Fix variables referring to their own address #70587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2023
Merged

[clang][Interp] Fix variables referring to their own address #70587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang/lib/AST/Interp/Interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@ bool OffsetHelper(InterpState &S, CodePtr OpPC, const T &Offset,
DiagInvalidOffset();
}

if (Invalid && !Ptr.isDummy())
if (Invalid && !Ptr.isDummy() && S.getLangOpts().CPlusPlus)
return false;

// Offset is valid - compute it on unsigned.
Expand Down Expand Up @@ -1531,7 +1531,7 @@ inline bool SubPtr(InterpState &S, CodePtr OpPC) {
const Pointer &LHS = S.Stk.pop<Pointer>();
const Pointer &RHS = S.Stk.pop<Pointer>();

if (!Pointer::hasSameArray(LHS, RHS)) {
if (!Pointer::hasSameBase(LHS, RHS) && S.getLangOpts().CPlusPlus) {
// TODO: Diagnose.
return false;
}
Expand Down
4 changes: 4 additions & 0 deletions clang/test/AST/Interp/c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// RUN: %clang_cc1 -pedantic -verify=pedantic-ref -std=c11 %s

typedef __INTPTR_TYPE__ intptr_t;
typedef __PTRDIFF_TYPE__ ptrdiff_t;

_Static_assert(1, "");
_Static_assert(0 != 1, "");
Expand Down Expand Up @@ -81,3 +82,6 @@ const intptr_t L = (intptr_t)(&(yy->y)); // expected-error {{not a compile-time
// pedantic-expected-error {{not a compile-time constant}} \
// ref-error {{not a compile-time constant}} \
// pedantic-ref-error {{not a compile-time constant}}
const ptrdiff_t m = &m + 137 - &m;
_Static_assert(m == 137, ""); // pedantic-ref-warning {{GNU extension}} \
// pedantic-expected-warning {{GNU extension}}
15 changes: 15 additions & 0 deletions clang/test/AST/Interp/literals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define INT_MAX __INT_MAX__

typedef __INTPTR_TYPE__ intptr_t;
typedef __PTRDIFF_TYPE__ ptrdiff_t;


static_assert(true, "");
Expand Down Expand Up @@ -198,6 +199,20 @@ namespace PointerComparison {
// ref-note {{comparison between '&s.b' and 'nullptr' has unspecified value}}

constexpr bool v7 = qv <= (void*)&s.b; // ok

constexpr ptrdiff_t m = &m - &m;
static_assert(m == 0, "");

constexpr ptrdiff_t m2 = (&m2 + 1) - (&m2 + 1);
static_assert(m2 == 0, "");

constexpr long m3 = (&m3 + 1) - (&m3);
static_assert(m3 == 1, "");

constexpr long m4 = &m4 + 2 - &m4; // ref-error {{must be initialized by a constant expression}} \
// ref-note {{cannot refer to element 2 of non-array object}} \
// expected-error {{must be initialized by a constant expression}} \
// expected-note {{cannot refer to element 2 of non-array object}}
}

namespace SizeOf {
Expand Down