commit cfaec05de39adb34392b8c7b1ad4b32abbf3663d
author Bill Wendling <isanbard@gmail.com> Wed May 13 19:04:02 2009 +0000
committer Bill Wendling <isanbard@gmail.com> Wed May 13 19:04:02 2009 +0000
tree 1ff93b6360a4c7896478177d95a3c86b7481c954
parent a27b5d020fcb63d33da4e9ae3c3011f93f255ae9

--- Reverse-merging r71693 into '.':
U    gcc/c-common.c

This isn't strictly needed for non-Ada languages.

llvm-svn: 71696

llvm-gcc-4.2/gcc/c-common.c

diff --git a/llvm-gcc-4.2/gcc/c-common.c b/llvm-gcc-4.2/gcc/c-common.c
index 3781239..adcb4a4 100644
--- a/llvm-gcc-4.2/gcc/c-common.c
+++ b/llvm-gcc-4.2/gcc/c-common.c
@@ -4739,12 +4739,9 @@
   tree type = TREE_TYPE (*node);
 
   /* See FIXME comment on noreturn in c_common_attribute_table.  */
-  /* LLVM LOCAL begin */
-  if (TREE_CODE (*node) == FUNCTION_DECL) {
+  if (TREE_CODE (*node) == FUNCTION_DECL)
     TREE_READONLY (*node) = 1;
-    TREE_NOTHROW (*node) = 1;
-  } else if (TREE_CODE (type) == POINTER_TYPE
-  /* LLVM LOCAL end */
+  else if (TREE_CODE (type) == POINTER_TYPE
 	   && TREE_CODE (TREE_TYPE (type)) == FUNCTION_TYPE)
     TREE_TYPE (*node)
       = build_pointer_type
@@ -5576,13 +5573,10 @@
 handle_pure_attribute (tree *node, tree name, tree ARG_UNUSED (args),
 		       int ARG_UNUSED (flags), bool *no_add_attrs)
 {
-  /* LLVM LOCAL begin */
-  if (TREE_CODE (*node) == FUNCTION_DECL) {
+  if (TREE_CODE (*node) == FUNCTION_DECL)
     DECL_IS_PURE (*node) = 1;
-    TREE_NOTHROW (*node) = 1;
-  } else
-  /* LLVM LOCAL end */
-    /* ??? TODO: Support types.  */
+  /* ??? TODO: Support types.  */
+  else
     {
       warning (OPT_Wattributes, "%qE attribute ignored", name);
       *no_add_attrs = true;