aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/class.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2017-02-20 01:06:20 -0500
committerJason Merrill <jason@gcc.gnu.org>2017-02-20 01:06:20 -0500
commitbcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4 (patch)
tree6cc39a69826ad9678cd2bf4c5403bc8a292e9879 /gcc/cp/class.c
parent736a933c00ff57c2631bae3d1eeeacd73faf003c (diff)
downloadgcc-bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4.zip
gcc-bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4.tar.gz
gcc-bcbdfa4ce0ba21fe081b96dffef4b9bbb43cfae4.tar.bz2
PR c++/79606 - ICE with this->base_member in NSDMI
* class.c (build_base_path): Check processing_template_decl. From-SVN: r245593
Diffstat (limited to 'gcc/cp/class.c')
-rw-r--r--gcc/cp/class.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 1442b55..9e4b4c4 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -375,6 +375,7 @@ build_base_path (enum tree_code code,
set up properly yet, and the value doesn't matter there either; we're
just interested in the result of overload resolution. */
if (cp_unevaluated_operand != 0
+ || processing_template_decl
|| in_template_function ())
{
expr = build_nop (ptr_target_type, expr);