procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/80891 (#3)

Browse source 
PR c++/80891 (#3)
	* cp-tree.h (build_min_nt_call_vec): Declare.
	* decl.c (build_offset_ref_call_from_tree): Call it.
	* parser.c (cp_parser_postfix_expression): Likewise.
	* pt.c (tsubst_copy_and_build): Likewise.
	* semantics.c (finish_call_expr): Likewise.
	* tree.c (build_min_nt_loc): Keep unresolved lookups.
	(build_min): Likewise.
	(build_min_non_dep): Likewise.
	(build_min_non_dep_call_vec): Likewise.
	(build_min_nt_call_vec): New.

	PR c++/80891 (#3)
	* g++.dg/lookup/pr80891-3.C: New.

From-SVN: r248571
This commit is contained in:
Nathan Sidwell 2017-05-29 12:52:58 +00:00 • committed by Nathan Sidwell
parent 724e517a7d
commit 58dec01056
9 changed files with 82 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gcc/cp/ChangeLog
View file

@ -1,10 +1,24 @@
2017-05-26 Nathan Sidwell <nathan@acm.org>
2017-05-29 Nathan Sidwell <nathan@acm.org>
PR c++/80891 (#3)
* cp-tree.h (build_min_nt_call_vec): Declare.
* decl.c (build_offset_ref_call_from_tree): Call it.
* parser.c (cp_parser_postfix_expression): Likewise.
* pt.c (tsubst_copy_and_build): Likewise.
* semantics.c (finish_call_expr): Likewise.
* tree.c (build_min_nt_loc): Keep unresolved lookups.
(build_min): Likewise.
(build_min_non_dep): Likewise.
(build_min_non_dep_call_vec): Likewise.
(build_min_nt_call_vec): New.
PR c++/80891 (#2)
* tree.c (ovl_copy): Adjust assert, copy OVL_LOOKUP.
(ovl_used): New.
(lookup_keep): Call it.
2017-05-26 Nathan Sidwell <nathan@acm.org>
Implement DR2061
* name-lookup.c (push_inline_namespaces): New.
(push_namespace): Look inside inline namespaces.

1
gcc/cp/cp-tree.h
View file

@ -6891,6 +6891,7 @@ extern tree build_min_nt_loc (location_t, enum tree_code,
...);
extern tree build_min_non_dep (enum tree_code, tree, ...);
extern tree build_min_non_dep_op_overload (enum tree_code, tree, tree, ...);
extern tree build_min_nt_call_vec (tree, vec<tree, va_gc> *);
extern tree build_min_non_dep_call_vec (tree, tree, vec<tree, va_gc> *);
extern vec<tree, va_gc>* vec_copy_and_insert (vec<tree, va_gc>*, tree, unsigned);
extern tree build_cplus_new (tree, tree, tsubst_flags_t);

2
gcc/cp/decl2.c
View file

@ -4891,7 +4891,7 @@ build_offset_ref_call_from_tree (tree fn, vec<tree, va_gc> **args,
|| TREE_CODE (fn) == MEMBER_REF);
if (type_dependent_expression_p (fn)
|| any_type_dependent_arguments_p (*args))
return build_nt_call_vec (fn, *args);
return build_min_nt_call_vec (fn, *args);
orig_args = make_tree_vector_copy (*args);

2
gcc/cp/parser.c
View file

@ -6952,7 +6952,7 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p,
{
maybe_generic_this_capture (instance, fn);
postfix_expression
= build_nt_call_vec (postfix_expression, args);
= build_min_nt_call_vec (postfix_expression, args);
release_tree_vector (args);
break;
}

2
gcc/cp/pt.c
View file

@ -17389,7 +17389,7 @@ tsubst_copy_and_build (tree t,
&& TREE_CODE (fn) != FIELD_DECL)
|| type_dependent_expression_p (fn)
|| any_type_dependent_arguments_p (call_args)))
ret = build_nt_call_vec (function, call_args);
ret = build_min_nt_call_vec (function, call_args);
else if (!BASELINK_P (fn))
ret = finish_call_expr (function, &call_args,
/*disallow_virtual=*/false,

2
gcc/cp/semantics.c
View file

@ -2322,7 +2322,7 @@ finish_call_expr (tree fn, vec<tree, va_gc> **args, bool disallow_virtual,
if (type_dependent_expression_p (fn)
|| any_type_dependent_arguments_p (*args))
{
result = build_nt_call_vec (fn, *args);
result = build_min_nt_call_vec (fn, *args);
SET_EXPR_LOCATION (result, EXPR_LOC_OR_LOC (fn, input_location));
KOENIG_LOOKUP_P (result) = koenig_p;
if (is_overloaded_fn (fn))

38
gcc/cp/tree.c
View file

@ -3216,13 +3216,14 @@ build_min_nt_loc (location_t loc, enum tree_code code, ...)
{
tree x = va_arg (p, tree);
TREE_OPERAND (t, i) = x;
if (x && TREE_CODE (x) == OVERLOAD)
lookup_keep (x, true);
}
va_end (p);
return t;
}
/* Similar to `build', but for template definitions. */
tree
@ -3245,8 +3246,13 @@ build_min (enum tree_code code, tree tt, ...)
{
tree x = va_arg (p, tree);
TREE_OPERAND (t, i) = x;
if (x && !TYPE_P (x) && TREE_SIDE_EFFECTS (x))
TREE_SIDE_EFFECTS (t) = 1;
if (x)
{
if (!TYPE_P (x) && TREE_SIDE_EFFECTS (x))
TREE_SIDE_EFFECTS (t) = 1;
if (TREE_CODE (x) == OVERLOAD)
lookup_keep (x, true);
}
}
va_end (p);
@ -3281,6 +3287,8 @@ build_min_non_dep (enum tree_code code, tree non_dep, ...)
{
tree x = va_arg (p, tree);
TREE_OPERAND (t, i) = x;
if (x && TREE_CODE (x) == OVERLOAD)
lookup_keep (x, true);
}
if (code == COMPOUND_EXPR && TREE_CODE (non_dep) != COMPOUND_EXPR)
@ -3292,14 +3300,34 @@ build_min_non_dep (enum tree_code code, tree non_dep, ...)
return convert_from_reference (t);
}
/* Similar to `build_nt_call_vec', but for template definitions of
/* Similar to build_min_nt, but call expressions */
tree
build_min_nt_call_vec (tree fn, vec<tree, va_gc> *args)
{
tree ret, t;
unsigned int ix;
ret = build_vl_exp (CALL_EXPR, vec_safe_length (args) + 3);
CALL_EXPR_FN (ret) = fn;
CALL_EXPR_STATIC_CHAIN (ret) = NULL_TREE;
FOR_EACH_VEC_SAFE_ELT (args, ix, t)
{
CALL_EXPR_ARG (ret, ix) = t;
if (TREE_CODE (t) == OVERLOAD)
lookup_keep (t, true);
}
return ret;
}
/* Similar to `build_min_nt_call_vec', but for template definitions of
non-dependent expressions. NON_DEP is the non-dependent expression
that has been built. */
tree
build_min_non_dep_call_vec (tree non_dep, tree fn, vec<tree, va_gc> *argvec)
{
tree t = build_nt_call_vec (fn, argvec);
tree t = build_min_nt_call_vec (fn, argvec);
if (REFERENCE_REF_P (non_dep))
non_dep = TREE_OPERAND (non_dep, 0);
TREE_TYPE (t) = TREE_TYPE (non_dep);

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2017-05-29 Nathan Sidwell <nathan@acm.org>
PR c++/80891 (#3)
* g++.dg/lookup/pr80891-3.C: New.
PR c++/80891 (#2)
* g++.dg/lookup/pr80891-2.C: New.

26
gcc/testsuite/g++.dg/lookup/pr80891-3.C Normal file
View file

@ -0,0 +1,26 @@
// PR c++/80891 part 3
// We were failing to mark OVERLOADS held in template definitions as
// immutable in non-call contexts.
namespace std {
int endl();
}
using std::endl;
template <class RealType> void test_spots(RealType)
{
using namespace std;
RealType a;
a << endl;
}
template <typename T>
void operator<< (T, int (&)());
struct Q {};
void test_maintest_method()
{
Q q;
test_spots(q);
}