diff options
| author | Nathan Sidwell <nathans@fb.com> | 2020-01-14 13:08:14 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathans@fb.com> | 2020-01-14 13:08:14 -0800 |
| commit | ddd792fa53345180c782494aa597e438a73b6248 (patch) | |
| tree | b9631e413ca1830fc4da395c62049137a67b41d3 | |
| parent | 288c5324bf6e418dd94d718d1619464a4f68ff8e (diff) | |
[PR90916] Use TI accessor.
PR c++/90916
* pt.c (retrieve_specialization): Use get_template_info, not open
coding access.
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c1375398517..59e0994c397 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2020-01-14 Nathan Sidwell <nathan@acm.org> + PT c++/90916 + * pt.c (retrieve_specialization): Use get_template_info, not open + coding access. + PR c++/90916 * pt.c (retrieve_specialization): Get the TI from the decl or the classtype as appropriate. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7e675ce9039..9bb8cc13e5f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1252,9 +1252,7 @@ retrieve_specialization (tree tmpl, tree args, hashval_t hash) for (ovl_iterator iter (fns); iter; ++iter) { tree fn = *iter; - if (tree ti = (TREE_CODE (fn) == TYPE_DECL && !TYPE_DECL_ALIAS_P (fn) - ? TYPE_TEMPLATE_INFO (TREE_TYPE (fn)) - : DECL_TEMPLATE_INFO (fn))) + if (tree ti = get_template_info (fn)) if (TI_TEMPLATE (ti) == tmpl /* using-declarations can bring in a different instantiation of tmpl as a member of a different |