diff options
| author | Jason Merrill <jason@redhat.com> | 2010-04-27 17:25:29 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-04-27 17:25:29 -0400 |
| commit | 16de17aec71ab79c098ce82ac091f447f272834c (patch) | |
| tree | 9a8f6997daec2174729a1f11829256be8e953acf /gcc | |
| parent | 95b24c84c3d66cba21214df45e041ed9a8bd6be1 (diff) | |
| download | gcc-16de17aec71ab79c098ce82ac091f447f272834c.zip gcc-16de17aec71ab79c098ce82ac091f447f272834c.tar.gz gcc-16de17aec71ab79c098ce82ac091f447f272834c.tar.bz2 | |
* semantics.c (baselink_for_fns): Correct BASELINK_BINFO.
From-SVN: r158806
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0e1538c..d0a112c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2010-04-27 Jason Merrill <jason@redhat.com> + * semantics.c (baselink_for_fns): Correct BASELINK_BINFO. + PR c++/43875 * semantics.c (lambda_return_type): Complain about braced-init-list. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 05c5168..6bf33c7 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2692,7 +2692,8 @@ baselink_for_fns (tree fns) if (!cl) cl = DECL_CONTEXT (fn); cl = TYPE_BINFO (cl); - return build_baselink (cl, cl, fns, /*optype=*/NULL_TREE); + return build_baselink (TYPE_BINFO (DECL_CONTEXT (fn)), cl, fns, + /*optype=*/NULL_TREE); } /* Returns true iff DECL is an automatic variable from a function outside |