[llvm-branch-commits] [llvm-gcc-branch] r85650 - /llvm-gcc-4.2/branches/Apple/Leela/gcc/cp/decl.c

[Bill Wendling]

Author: void
Date: Sat Oct 31 04:28:48 2009
New Revision: 85650

URL: http://llvm.org/viewvc/llvm-project?rev=85650&view=rev
Log:
$ svn merge -c 85649 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r85649 into '.':
U    gcc/cp/decl.c


Modified:
    llvm-gcc-4.2/branches/Apple/Leela/gcc/cp/decl.c

Modified: llvm-gcc-4.2/branches/Apple/Leela/gcc/cp/decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/gcc/cp/decl.c?rev=85650&r1=85649&r2=85650&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/gcc/cp/decl.c (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/gcc/cp/decl.c Sat Oct 31 04:28:48 2009
@@ -12102,7 +12102,18 @@
       && !cp_function_chain->can_throw
       && !flag_non_call_exceptions
       && !DECL_REPLACEABLE_P (fndecl))
-    TREE_NOTHROW (fndecl) = 1;
+    /* LLVM LOCAL begin - set nothrow for thunks to what it is for the
+       function that they're thunking.  */
+    {
+#ifdef ENABLE_LLVM
+      if (DECL_THUNK_P (fndecl))
+        TREE_NOTHROW (fndecl) = TREE_NOTHROW (THUNK_TARGET (fndecl));
+      else
+#endif
+        TREE_NOTHROW (fndecl) = 1;
+    }
+    /* LLVM LOCAL end - set nothrow for thunks to what it is for the
+       function that they're thunking.  */
 
   /* This must come after expand_function_end because cleanups might
      have declarations (from inline functions) that need to go into