* semantics.c (baselink_for_fns): Correct BASELINK_BINFO.

From-SVN: r158806

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0e1538ca6dfe34c56901ac1d3eb5457dbcebbf19..d0a112c9e808c1cfe777fa19257d40bd79772d62 100644 (file)
--- 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 05c516870a948db0990634b4ebad6d96bc8d94f6..6bf33c7f5f299344769dac9e402fb0f127e47899 100644 (file)
--- 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