From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 25 Mar 2013 14:46:08 +0000 (+0000)
Subject: 2013-03-25  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0565e0b5eef8bb4bd124b8d04985e673728dad92;p=thirdparty%2Fgcc.git

2013-03-25  Richard Biener  <rguenther@suse.de>

	PR middle-end/56694
	* tree-eh.c (lower_eh_must_not_throw): Strip BLOCKs from the
	must-not-throw stmt location.

	* g++.dg/torture/pr56694.C: New testcase.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197047 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c3ac959a314..593d492128f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/56694
+	* tree-eh.c (lower_eh_must_not_throw): Strip BLOCKs from the
+	must-not-throw stmt location.
+
 2013-03-25  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/arm/arm.c (arm_emit_load_exclusive): Add acq parameter.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e1cd5b0d8f8..06eb1a6cf104 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,10 @@
+2013-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/56694
+	* g++.dg/torture/pr56694.C: New testcase.
+
 2013-03-25  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
 	PR target/56720
 	* gcc.target/arm/neon-vcond-gt.c: New test.
 	* gcc.target/arm/neon-vcond-ltgt.c: Likewise.
diff --git a/gcc/testsuite/g++.dg/torture/pr56694.C b/gcc/testsuite/g++.dg/torture/pr56694.C
new file mode 100644
index 000000000000..22bfe3cc7156
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr56694.C
@@ -0,0 +1,30 @@
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+class GException {
+public:
+    class vector_mismatch {
+    public:
+	vector_mismatch(int size1, int size2);
+    };
+};
+class GVector{
+public:
+    GVector& operator+=(const GVector& v);
+    int m_num;
+    double* m_data;
+};
+inline GVector& GVector::operator+= (const GVector& v)
+{
+  if (m_num != v.m_num)
+    throw GException::vector_mismatch(m_num, v.m_num);
+  for (int i = 0; i < m_num; ++i)  m_data[i] += v.m_data[i];
+};
+void eval(GVector* m_gradient, GVector* vect_cpy_grad, int n)
+{
+#pragma omp sections
+    {
+      for (int i = 0; i < n; ++i)
+	*m_gradient += vect_cpy_grad[i];
+    }
+}
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 6b9dac9258e2..973782ba5a86 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -1855,7 +1855,8 @@ lower_eh_must_not_throw (struct leh_state *state, gimple tp)
       this_region = gen_eh_region_must_not_throw (state->cur_region);
       this_region->u.must_not_throw.failure_decl
 	= gimple_eh_must_not_throw_fndecl (inner);
-      this_region->u.must_not_throw.failure_loc = gimple_location (tp);
+      this_region->u.must_not_throw.failure_loc
+	= LOCATION_LOCUS (gimple_location (tp));
 
       /* In order to get mangling applied to this decl, we must mark it
 	 used now.  Otherwise, pass_ipa_free_lang_data won't think it