[llvm-branch-commits] [llvm-gcc-branch] r71696 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/c-common.c

[Bill Wendling]

Author: void
Date: Wed May 13 14:04:02 2009
New Revision: 71696

URL: http://llvm.org/viewvc/llvm-project?rev=71696&view=rev
Log:
--- Reverse-merging r71693 into '.':
U    gcc/c-common.c

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

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/c-common.c

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/c-common.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/c-common.c?rev=71696&r1=71695&r2=71696&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/c-common.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/c-common.c Wed May 13 14:04:02 2009
@@ -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;