From 16de17aec71ab79c098ce82ac091f447f272834c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 27 Apr 2010 17:25:29 -0400 Subject: [PATCH] * semantics.c (baselink_for_fns): Correct BASELINK_BINFO. From-SVN: r158806 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/semantics.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0e1538ca6df..d0a112c9e80 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2010-04-27 Jason Merrill + * 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 05c516870a9..6bf33c7f5f2 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 -- 2.30.2