diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-16 15:28:55 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-16 15:28:55 +0000 |
| commit | 74f8420a5b204c5e021ce05b3d0d79ba9718360a (patch) | |
| tree | 9f90a3317de2b4fa1ec8f93c322df10664acee4f /gcc/cp/search.c | |
| parent | dd329d30040f8c9e493bf85514c364d5ac5d6551 (diff) | |
| download | gcc-74f8420a5b204c5e021ce05b3d0d79ba9718360a.tar.gz | |
2016-04-16 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with even more of GCC 6, using subversion 1.9
svn merge -r230701:231650 ^/trunk
}}
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@235062 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 0c11a8318cb..05a45c3fbfb 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1271,7 +1271,8 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type, /* Make sure we're looking for a member of the current instantiation in the right partial specialization. */ if (flag_concepts && dependent_type_p (type)) - type = currently_open_class (type); + if (tree t = currently_open_class (type)) + type = t; if (!basetype_path) basetype_path = TYPE_BINFO (type); |