From fbd603c43d7315bf2b29880548cb80ef4d8f62cd Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 16 Mar 2017 17:16:33 -0400 Subject: [PATCH] re PR c++/79797 (ICE with NSDMI, this pointer and constexpr) PR c++/79797 * constexpr.c (lookup_placeholder): Tweak. From-SVN: r246210 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/constexpr.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e5fa93aefb3..99836fbaeea 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-03-16 Jason Merrill + + PR c++/79797 + * constexpr.c (lookup_placeholder): Tweak. + 2017-03-15 Jason Merrill PR c++/80043 - ICE with -fpermissive diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 2510e23e61b..4136b349282 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3832,14 +3832,17 @@ cxx_eval_switch_expr (const constexpr_ctx *ctx, tree t, static tree lookup_placeholder (const constexpr_ctx *ctx, bool lval, tree type) { - if (!ctx || !ctx->ctor || (lval && !ctx->object)) + if (!ctx) return NULL_TREE; /* We could use ctx->object unconditionally, but using ctx->ctor when we can is a minor optimization. */ - if (!lval && same_type_p (TREE_TYPE (ctx->ctor), type)) + if (!lval && ctx->ctor && same_type_p (TREE_TYPE (ctx->ctor), type)) return ctx->ctor; + if (!ctx->object) + return NULL_TREE; + /* Since an object cannot have a field of its own type, we can search outward from ctx->object to find the unique containing object of TYPE. */ tree ob = ctx->object; -- 2.30.2