backport: re PR c++/89512 (ICE in get_expr_operands, at tree-ssa-operands.c:882)

	Backported from mainline
	2019-03-14  Jakub Jelinek  <jakub@redhat.com>

	PR c++/89512
	* semantics.c (finish_qualified_id_expr): Reject variable templates.

	* g++.dg/cpp1y/var-templ61.C: New test.

From-SVN: r275130

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 735a3640a86973ca7694dc9419e2908465da80a4..0312b25d11bf7c9636c4c57588440776f2db327f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,11 @@
 2019-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2019-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/89512
+       * semantics.c (finish_qualified_id_expr): Reject variable templates.
+
        2019-03-06  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/87148

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index dd95c74d7b0aa5373ca595cc0b5c5ab37bb1fe00..d0d0658c81fe689732cebc11ba1ce275e044d3d6 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2067,6 +2067,14 @@ finish_qualified_id_expr (tree qualifying_class,
     }
   else if (BASELINK_P (expr))
     ;
+  else if (!template_p
+          && TREE_CODE (expr) == TEMPLATE_DECL
+          && !DECL_FUNCTION_TEMPLATE_P (expr))
+    {
+      if (complain & tf_error)
+       error ("%qE missing template arguments", expr);
+      return error_mark_node;
+    }
   else
     {
       /* In a template, return a SCOPE_REF for most qualified-ids

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c14e5d26dfbc7eb0e4419ecab7e071151eb55e7..6476485213640ae03d6c31e847d808e26306e273 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2019-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2019-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/89512
+       * g++.dg/cpp1y/var-templ61.C: New test.
+
        2019-03-13  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/88588

diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ61.C b/gcc/testsuite/g++.dg/cpp1y/var-templ61.C
new file mode 100644 (file)
index 0000000..be2fe0f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/var-templ61.C
@@ -0,0 +1,20 @@
+// PR c++/89512
+// { dg-do compile { target c++14 } }
+
+struct A {
+  template <typename T>
+  static const int a = 0;
+};
+
+struct B {
+  template <typename T>
+  static int foo ()
+  {
+    return T::a;               // { dg-error "missing template arguments" }
+  }
+};
+
+int bar ()
+{
+  return B::foo<A> ();         // { dg-message "required from here" }
+}