diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 89f2d8896ab..1a3e73e40c6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-06  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88373 - wrong parse error with ~.
+	* parser.c (cp_parser_template_name): Check tag_type for
+	none_type.
+
 2018-12-06  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* cp-tree.h (finish_asm_stmt): Update declaration.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ceae72a7709..adfe09e494d 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -16579,7 +16579,8 @@ cp_parser_template_name (cp_parser* parser,
       if (!found
 	  && (cxx_dialect > cxx17)
 	  && !scoped_p
-	  && cp_lexer_next_token_is (parser->lexer, CPP_LESS))
+	  && cp_lexer_next_token_is (parser->lexer, CPP_LESS)
+	  && tag_type == none_type)
 	{
 	  /* [temp.names] says "A name is also considered to refer to a template
 	     if it is an unqualified-id followed by a < and name lookup finds
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index acac4fdcee5..047b4b3bf01 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-06  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88373 - wrong parse error with ~.
+	* g++.dg/cpp2a/fn-template19.C: New test.
+
 2018-12-06  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* gcc.dg/vect/vect-over-widen-23.c: Remove unwanted line.
diff --git a/gcc/testsuite/g++.dg/cpp2a/fn-template19.C b/gcc/testsuite/g++.dg/cpp2a/fn-template19.C
new file mode 100644
index 00000000000..1d6b43bb7ce
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/fn-template19.C
@@ -0,0 +1,11 @@
+// PR c++/88373
+// { dg-do compile }
+// { dg-options "-std=c++2a" }
+
+template <class T>
+constexpr T value = T {};
+
+template <class T, T t>
+struct S {};
+
+using U = S <int, ~value <int>>;