[llvm-commits] CVS: llvm-gcc/gcc/cp/typeck.c

[Chris Lattner]

Changes in directory llvm-gcc/gcc/cp:

typeck.c updated: 1.4 -> 1.5
---
Log message:

Merge in the patch for this bugfix:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12924


---
Diffs of the changes:  (+5 -0)

 typeck.c |    5 +++++
 1 files changed, 5 insertions(+)


Index: llvm-gcc/gcc/cp/typeck.c
diff -u llvm-gcc/gcc/cp/typeck.c:1.4 llvm-gcc/gcc/cp/typeck.c:1.5
--- llvm-gcc/gcc/cp/typeck.c:1.4	Mon Jan  3 16:29:15 2005
+++ llvm-gcc/gcc/cp/typeck.c	Fri Feb 11 14:09:06 2005
@@ -1863,6 +1863,11 @@
 	  is_template_id = true;
 	  template_args = TREE_OPERAND (name, 1);
 	  name = TREE_OPERAND (name, 0);
+
+	  if (TREE_CODE (name) == OVERLOAD)
+	    name = DECL_NAME (get_first_fn (name));
+	  else if (DECL_P (name))
+	    name = DECL_NAME (name);
 	}
 
       if (TREE_CODE (name) == SCOPE_REF)