From: Jan Hubicka <jh@suse.cz>
Date: Tue, 10 Sep 2013 13:46:31 +0000 (+0200)
Subject: gimple-fold.c (gimple_get_virt_method_for_binfo): Pass real VAR_DECL of vtable rather... 
X-Git-Tag: releases/gcc-4.9.0~4166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=668b689457961fbcbd6c140aea21d03729a844e7;p=thirdparty%2Fgcc.git

gimple-fold.c (gimple_get_virt_method_for_binfo): Pass real VAR_DECL of vtable rather than full expression.


	* gimple-fold.c (gimple_get_virt_method_for_binfo): Pass real
	VAR_DECL of vtable rather than full expression.

From-SVN: r202446
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b07980abe02a..f98817a8ff67 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-10  Jan Hubicka  <jh@suse.cz>
+
+	* gimple-fold.c (gimple_get_virt_method_for_binfo): Pass real
+	VAR_DECL of vtable rather than full expression.
+
 2013-09-10  Jan Hubicka  <jh@suse.cz>
 	    Paolo Carlini  <paolo.carlini@oracle.com>
 
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index e6baabfa03d0..fcb102ba6c09 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -3135,7 +3135,7 @@ gimple_get_virt_method_for_binfo (HOST_WIDE_INT token, tree known_binfo)
   size = tree_low_cst (TYPE_SIZE (TREE_TYPE (TREE_TYPE (v))), 1);
   offset += token * size;
   fn = fold_ctor_reference (TREE_TYPE (TREE_TYPE (v)), init,
-			    offset, size, vtable);
+			    offset, size, v);
   if (!fn || integer_zerop (fn))
     return NULL_TREE;
   gcc_assert (TREE_CODE (fn) == ADDR_EXPR