diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afd6cc87347..e788ff6e9e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-29  Kai Tietz  <kai.tietz@onevision.com>
+
+	* tree.c (handle_dll_attribute): Check if node is
+	of kind FUNCTION_DECL for DECL_DECLARED_INLINE_P check.
+
 2009-05-29  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/thumb2.md (thumb2_zero_extendsidi2): Add a split
diff --git a/gcc/tree.c b/gcc/tree.c
index ddfa0a43258..5e562a59e05 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4169,7 +4169,8 @@ handle_dll_attribute (tree * pnode, tree name, tree args, int flags,
       if (*no_add_attrs == false)
         DECL_DLLIMPORT_P (node) = 1;
     }
-  else if (DECL_DECLARED_INLINE_P (node))
+  else if (TREE_CODE (node) == FUNCTION_DECL
+	   && DECL_DECLARED_INLINE_P (node))
     /* An exported function, even if inline, must be emitted.  */
     DECL_EXTERNAL (node) = 0;