Corrected pre-overload-resolution function evaluation.

2010-07-21  Sami Wagiaalla  <swagiaal@redhat.com>

	* eval.c (evaluate_subexp_standard): Disabled evaluation of C++
	function symbols before overload resolution.

2010-07-21  Sami Wagiaalla  <swagiaal@redhat.com>

	* gdb.cp/fpointer.cc: New test.
	* gdb.cp/fpointer.exp: New test.

5 files changed, 110 insertions, 10 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 39eb192..6671818 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-21  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* eval.c (evaluate_subexp_standard): Disabled evaluation of C++
+	function symbols before overload resolution.
+
 2010-07-21  Pedro Alves  <pedro@codesourcery.com>
 
 	* breakpoint.c (bptype_string): New, abstracted out from
diff --git a/gdb/eval.c b/gdb/eval.c
index ff17c34..2694781 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1570,19 +1570,29 @@ evaluate_subexp_standard (struct type *expect_type,
 	{
 	  /* Non-method function call */
 	  save_pos1 = *pos;
-	  argvec[0] = evaluate_subexp_with_coercion (exp, pos, noside);
 	  tem = 1;
-	  type = value_type (argvec[0]);
-	  if (type && TYPE_CODE (type) == TYPE_CODE_PTR)
-	    type = TYPE_TARGET_TYPE (type);
-	  if (type && TYPE_CODE (type) == TYPE_CODE_FUNC)
+
+	  /* If this is a C++ function wait until overload resolution.  */
+	  if (op == OP_VAR_VALUE
+	      && overload_resolution
+	      && (exp->language_defn->la_language == language_cplus))
 	    {
-	      for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++)
+	      (*pos) += 4; /* Skip the evaluation of the symbol.  */
+	      argvec[0] = NULL;
+	    }
+	  else
+	    {
+	      argvec[0] = evaluate_subexp_with_coercion (exp, pos, noside);
+	      type = value_type (argvec[0]);
+	      if (type && TYPE_CODE (type) == TYPE_CODE_PTR)
+		type = TYPE_TARGET_TYPE (type);
+	      if (type && TYPE_CODE (type) == TYPE_CODE_FUNC)
 		{
-		  /* pai: FIXME This seems to be coercing arguments before
-		   * overload resolution has been done! */
-		  argvec[tem] = evaluate_subexp (TYPE_FIELD_TYPE (type, tem - 1),
-						 exp, pos, noside);
+		  for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++)
+		    {
+		      argvec[tem] = evaluate_subexp (TYPE_FIELD_TYPE (type, tem - 1),
+						     exp, pos, noside);
+		    }
 		}
 	    }
 	}
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 41d00e4..178161a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-21  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* gdb.cp/fpointer.cc: New test.
+	* gdb.cp/fpointer.exp: New test.
+
 2010-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/solib-nodir.exp: New file.
diff --git a/gdb/testsuite/gdb.cp/fpointer.cc b/gdb/testsuite/gdb.cp/fpointer.cc
new file mode 100644
index 0000000..007ea39
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/fpointer.cc
@@ -0,0 +1,40 @@
+#include "stdio.h"
+
+int foo(){
+  return 11;
+}
+
+int bar(){
+  return 12;
+}
+
+int bar(int){
+  printf ("bar(int)\n");
+  return 13;
+}
+
+int bar(char){
+  printf ("bar(char)\n");
+  return 14;
+}
+
+int (*p1)() = &foo;
+int (*p2)() = &bar;
+int (*p[2])() = {p1,p2};
+
+int (*p3)(int) = &bar;
+int (*p4)(char) = &bar;
+
+int main ()
+{
+  p1 ();
+  p2 ();
+
+  p[0]();
+  p[1]();
+
+  p3 ('a');
+  p4 (1);
+
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp
new file mode 100644
index 0000000..2abec2b
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/fpointer.exp
@@ -0,0 +1,40 @@
+# Copyright 2008, 2010 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This tests for evaluation of functions in the form of
+# complex expressions.
+
+set testfile fpointer
+set srcfile ${testfile}.cc
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } {
+     return -1
+}
+
+if ![runto_main] then {
+    perror "couldn't run to breakpoint main"
+    continue
+}
+
+# Test that function calls done through function pointers
+gdb_test "p p1()" "= 11"
+gdb_test "p p2()" "= 12"
+
+gdb_test {p p[0]()} "= 11"
+gdb_test {p p[1]()} "= 12"
+
+# Test that overload resolution is not performed for function
+# pointers.
+gdb_test "p p3('a')" "= 13"
+gdb_test "p p4(1)"   "= 14"