@@ -8785,7 +8785,10 @@ gimplify_omp_for (tree *expr_p, gimple_s
decl, false))
;
else if (outer->region_type != ORT_COMBINED_PARALLEL)
- outer = NULL;
+ {
+ omp_notice_variable (outer, decl, true);
+ outer = NULL;
+ }
if (outer)
{
n = splay_tree_lookup (outer->variables,
@@ -8868,7 +8871,10 @@ gimplify_omp_for (tree *expr_p, gimple_s
decl, false))
;
else if (outer->region_type != ORT_COMBINED_PARALLEL)
- outer = NULL;
+ {
+ omp_notice_variable (outer, decl, true);
+ outer = NULL;
+ }
if (outer)
{
n = splay_tree_lookup (outer->variables,
@@ -0,0 +1,75 @@
+/* PR middle-end/70680 */
+
+int v;
+
+void
+f1 (void)
+{
+ int i = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd
+ for (i = 0; i < 100; i++)
+ ;
+ v = i;
+ }
+ if (i != 100)
+ __builtin_abort ();
+}
+
+void
+f2 (void)
+{
+ int i = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd
+ for (i = 0; i < 100; i++)
+ ;
+ }
+ if (i != 100)
+ __builtin_abort ();
+}
+
+void
+f3 (void)
+{
+ int i = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd linear(i: 1)
+ for (i = 0; i < 100; i++)
+ ;
+ v = i;
+ }
+ if (i != 100)
+ __builtin_abort ();
+}
+
+void
+f4 (void)
+{
+ int i = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd linear(i: 1)
+ for (i = 0; i < 100; i++)
+ ;
+ }
+ if (i != 100)
+ __builtin_abort ();
+}
+
+int
+main ()
+{
+ f1 ();
+ if (v++ != 100)
+ __builtin_abort ();
+ f2 ();
+ f3 ();
+ if (v++ != 100)
+ __builtin_abort ();
+ f4 ();
+ return 0;
+}
@@ -0,0 +1,79 @@
+/* PR middle-end/70680 */
+
+int v;
+
+void
+f1 (void)
+{
+ int i = 0, j = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd collapse(2)
+ for (i = 0; i < 10; i++)
+ for (j = 0; j < 10; j++)
+ ;
+ v = i + j;
+ }
+ if (i != 10 || j != 10)
+ __builtin_abort ();
+}
+
+void
+f2 (void)
+{
+ int i = 0, j = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd collapse(2)
+ for (i = 0; i < 10; i++)
+ for (j = 0; j < 10; j++)
+ ;
+ }
+ if (i != 10 || j != 10)
+ __builtin_abort ();
+}
+
+void
+f3 (void)
+{
+ int i = 0, j = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd collapse(2) lastprivate (i, j)
+ for (i = 0; i < 10; i++)
+ for (j = 0; j < 10; j++)
+ ;
+ v = i + j;
+ }
+ if (i != 10 || j != 10)
+ __builtin_abort ();
+}
+
+void
+f4 (void)
+{
+ int i = 0, j = 0;
+#pragma omp task default(shared) if(0)
+ {
+#pragma omp simd collapse(2) lastprivate (i, j)
+ for (i = 0; i < 10; i++)
+ for (j = 0; j < 10; j++)
+ ;
+ }
+ if (i != 10 || j != 10)
+ __builtin_abort ();
+}
+
+int
+main ()
+{
+ f1 ();
+ if (v++ != 20)
+ __builtin_abort ();
+ f2 ();
+ f3 ();
+ if (v++ != 20)
+ __builtin_abort ();
+ f4 ();
+ return 0;
+}