diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0aafd37f6be..3d01f81feb7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-04  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* decl2.c (arg_assoc): Deal with COMPONENT_REFs inside
+	TEMPLATE_ID_EXPRs.
+
 2000-09-03  Mark Mitchell  <mark@codesourcery.com>
 
 	* operators.def (ALIGNOF_EXPR, MAX_EXPR, MIN_EXPR): Change
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 90c6c3e4d17..417348c4033 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -5042,6 +5042,9 @@ arg_assoc (k, n)
       tree ctx;
       tree arg;
 
+      if (TREE_CODE (template) == COMPONENT_REF)
+        template = TREE_OPERAND (template, 1);
+      
       /* First, the template.  There may actually be more than one if
 	 this is an overloaded function template.  But, in that case,
 	 we only need the first; all the functions will be in the same