* semantics.c (baselink_for_fns): Correct BASELINK_BINFO.

From-SVN: r158806

* semantics.c (baselink_for_fns): Correct BASELINK_BINFO.
From-SVN: r158806
16de17ae · Jason Merrill · Jason Merrill · 95b24c84 · 16de17ae · 16de17ae
Commit 16de17ae authored Apr 27, 2010 by Jason Merrill Committed by Jason Merrill Apr 27, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

gcc/cp/ChangeLog
+2 -0

gcc/cp/semantics.c
+2 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 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.

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