diff options
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 |