diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9cc2aabc0db..9953b2094e1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2009-07-04  Jason Merrill  <jason@redhat.com>
 
+	* cp-tree.h (LANG_DECL_FN_CHECK): Fix non-checking version.
+
 	PR c++/40619
 	* cp-tree.h (struct lang_decl_parm): New.
 	(struct lang_decl): Add it.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 4cf5b14ca35..24351b4dad6 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1741,7 +1741,7 @@ struct GTY(()) lang_decl {
   (&DECL_LANG_SPECIFIC (NODE)->u.min)
 
 #define LANG_DECL_FN_CHECK(NODE) \
-  (&DECL_LANG_SPECIFIC (NODE)->u.fn)
+  (&DECL_LANG_SPECIFIC (STRIP_TEMPLATE (NODE))->u.fn)
 
 #define LANG_DECL_NS_CHECK(NODE) \
   (&DECL_LANG_SPECIFIC (NODE)->u.ns)