From: Jason Merrill <jason@redhat.com>
Date: Tue, 27 Apr 2010 21:25:29 +0000 (-0400)
Subject: * semantics.c (baselink_for_fns): Correct BASELINK_BINFO.
X-Git-Tag: releases/gcc-4.6.0~7612
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16de17aec71ab79c098ce82ac091f447f272834c;p=thirdparty%2Fgcc.git

* semantics.c (baselink_for_fns): Correct BASELINK_BINFO.

From-SVN: r158806
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0e1538ca6dfe..d0a112c9e808 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 05c516870a94..6bf33c7f5f29 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