diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0bdff8c3aa85b2bc641d5e661e4e5ffb6c5f0e4c..b0b36ce1380f1746c0d3c1f4b2e138a7d3705080 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR debug/28980
+	* dwarf2out.c (loc_descriptor_from_tree_1): Handle
+	FUNCTION_DECL.
+
 2006-09-13  Andreas Krebbel  <krebbel1@de.ibm.com>
 
 	* basic_block.h (bb_has_eh_pred): Fix comment.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 982d90823de23a4a712fdcec22849d4713f1b0f1..e82c81cc0a0cf4867a9be2184edff692d06ad168 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -9167,6 +9167,7 @@ loc_descriptor_from_tree_1 (tree loc, int want_address)
       /* FALLTHRU */
 
     case RESULT_DECL:
+    case FUNCTION_DECL:
       {
 	rtx rtl = rtl_for_decl_location (loc);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ae45deee4047492eb25b06f6c81c9a58a2765124..ce08250c81f09a06d2a54fad6352c3811ef05711 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR debug/28980
+	* gcc.c-torture/compile/debugvlafunction-1.c: New test.
+
 2006-09-13  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/specs/unchecked_union.ads: New test.
diff --git a/gcc/testsuite/gcc.c-torture/compile/debugvlafunction-1.c b/gcc/testsuite/gcc.c-torture/compile/debugvlafunction-1.c
new file mode 100644
index 0000000000000000000000000000000000000000..3911f87bc94457c794fc339fbb173a81bab577d5
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/debugvlafunction-1.c
@@ -0,0 +1,11 @@
+extern void dynreplace_trampoline(void);
+extern void dynreplace_trampoline_endlabel(void);
+int dynreplace_add_trampoline(void)
+{
+  unsigned long trampoline_code[(((unsigned long)
+(&(dynreplace_trampoline_endlabel))
+-(unsigned long) (&dynreplace_trampoline)))
+];
+}
+
+