From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 21 Apr 2010 21:20:07 +0000 (+0200)
Subject: re PR fortran/43836 (ice with -fexceptions and -fopenmp)
X-Git-Tag: releases/gcc-4.6.0~7731
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b65cd83e9a09a18d44984ca261b40b84d2eaeab;p=thirdparty%2Fgcc.git

re PR fortran/43836 (ice with -fexceptions and -fopenmp)

	PR fortran/43836
	* f95-lang.c (gfc_define_builtin): Set TREE_NOTHROW on
	the decl.

	* gfortran.dg/gomp/pr43836.f90: New test.

From-SVN: r158619
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 86cedc9466c8..27dab6d6ddae 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/43836
+	* f95-lang.c (gfc_define_builtin): Set TREE_NOTHROW on
+	the decl.
+
 2010-04-20  Harald Anlauf  <anlauf@gmx.de>
 
 	* intrinsic.c (sort_actual): Remove 'is' in error message.
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 96ff8bb2ef3f..8efa6de679be 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -1,5 +1,5 @@
 /* gfortran backend interface
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
    Free Software Foundation, Inc.
    Contributed by Paul Brook.
 
@@ -608,6 +608,7 @@ gfc_define_builtin (const char *name,
 			       library_name, NULL_TREE);
   if (const_p)
     TREE_READONLY (decl) = 1;
+  TREE_NOTHROW (decl) = 1;
 
   built_in_decls[code] = decl;
   implicit_built_in_decls[code] = decl;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f30277cf8ad4..2e6da4e7583c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/43836
+	* gfortran.dg/gomp/pr43836.f90: New test.
+
 2010-04-21  Richard Guenther  <rguenther@suse.de>
 
 	* gcc.dg/ipa/ipa-pta-11.c: Adjust.
diff --git a/gcc/testsuite/gfortran.dg/gomp/pr43836.f90 b/gcc/testsuite/gfortran.dg/gomp/pr43836.f90
new file mode 100644
index 000000000000..cf86523f52b7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/pr43836.f90
@@ -0,0 +1,10 @@
+! PR fortran/43836
+! { dg-do compile }
+! { dg-options "-fopenmp -fexceptions -O2" }
+subroutine foo
+!$omp single
+!$omp parallel
+  call bar
+!$omp end parallel
+!$omp end single
+end subroutine foo