* semantics.c (finish_id_expression): Don't assume a dependent
member of the current instantiation isn't a valid integral
constant expression. Check dependent_scope_p.
* pt.c (dependent_scope_p): Check TYPE_P.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145508
138bc75d-0d04-0410-961f-
82ee72b054a4
+2009-04-03 Jason Merrill <jason@redhat.com>
+
+ PR c++/39608
+ * semantics.c (finish_id_expression): Don't assume a dependent
+ member of the current instantiation isn't a valid integral
+ constant expression. Check dependent_scope_p.
+ * pt.c (dependent_scope_p): Check TYPE_P.
+ (tsubst_copy): If args is null, just return.
+
2009-04-02 Jason Merrill <jason@redhat.com>
PR c++/25185
enum tree_code code;
tree r;
- if (t == NULL_TREE || t == error_mark_node)
+ if (t == NULL_TREE || t == error_mark_node || args == NULL_TREE)
return t;
code = TREE_CODE (t);
bool
dependent_scope_p (tree scope)
{
- return dependent_type_p (scope) && !currently_open_class (scope);
+ return (scope && TYPE_P (scope) && dependent_type_p (scope)
+ && !currently_open_class (scope));
}
/* Returns TRUE if EXPRESSION is dependent, according to CRITERION. */
dependent. */
if (scope)
{
- /* Since this name was dependent, the expression isn't
- constant -- yet. No error is issued because it might
- be constant when things are instantiated. */
- if (integral_constant_expression_p)
- *non_integral_constant_expression_p = true;
if (TYPE_P (scope))
{
if (address_p && done)
done, address_p,
template_p,
template_arg_p);
- else if (dependent_type_p (scope))
+ else if (dependent_scope_p (scope))
decl = build_qualified_name (/*type=*/NULL_TREE,
scope,
id_expression,
+2009-04-03 Jason Merrill <jason@redhat.com>
+
+ PR c++/39608
+ * g++.dg/template/const2.C: New test.
+
2009-04-03 Richard Guenther <rguenther@suse.de>
PR tree-optimization/2480
--- /dev/null
+// PR c++/39608
+// We were improperly considering dependent members of the current
+// instantiation to be non-constant (and therefore invalid template
+// non-type arguments).
+
+template <int I>
+struct C {};
+
+template <class T>
+struct A
+{
+ static const T x = 1;
+ C<A<T>::x> c; // { dg-bogus "invalid" }
+};
+
+A<int> a;