Patchwork [committed] Fix OpenMP ICE on invalid during gimplification (PR c/47963)

login
register
mail settings
Submitter Jakub Jelinek
Date March 3, 2011, 4:14 p.m.
Message ID <20110303161425.GV30899@tyan-ft48-01.lab.bos.redhat.com>
Download mbox | patch
Permalink /patch/85296/
State New
Headers show

Comments

Jakub Jelinek - March 3, 2011, 4:14 p.m.
Hi!

omp_notice_variable isn't prepared to see INTEGER_CST (which wouldn't be
there on valid code where DECL_SIZE is a DECL).
Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux,
committed to trunk.

2011-03-03  Jakub Jelinek  <jakub@redhat.com>

	PR c/47963
	* gimplify.c (omp_add_variable): Only call omp_notice_variable
	on TYPE_SIZE_UNIT if it is a DECL.

	* gcc.dg/gomp/pr47963.c: New test.
	* g++.dg/gomp/pr47963.C: New test.


	Jakub

Patch

--- gcc/gimplify.c.jj	2010-12-09 11:12:48.000000000 +0100
+++ gcc/gimplify.c	2011-03-03 09:18:01.000000000 +0100
@@ -5511,7 +5511,8 @@  omp_add_variable (struct gimplify_omp_ct
 	 For local variables TYPE_SIZE_UNIT might not be gimplified yet,
 	 in this case omp_notice_variable will be called later
 	 on when it is gimplified.  */
-      else if (! (flags & GOVD_LOCAL))
+      else if (! (flags & GOVD_LOCAL)
+	       && DECL_P (TYPE_SIZE_UNIT (TREE_TYPE (decl))))
 	omp_notice_variable (ctx, TYPE_SIZE_UNIT (TREE_TYPE (decl)), true);
     }
   else if (lang_hooks.decls.omp_privatize_by_reference (decl))
--- gcc/testsuite/gcc.dg/gomp/pr47963.c.jj	2011-03-03 10:13:56.000000000 +0100
+++ gcc/testsuite/gcc.dg/gomp/pr47963.c	2011-03-03 09:22:41.000000000 +0100
@@ -0,0 +1,11 @@ 
+/* PR c/47963 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+void
+foo (float n)
+{
+  int A[n][n];	/* { dg-error "has non-integer type" } */
+#pragma omp parallel private(A)
+  ;
+}
--- gcc/testsuite/g++.dg/gomp/pr47963.C.jj	2011-03-03 10:13:22.000000000 +0100
+++ gcc/testsuite/g++.dg/gomp/pr47963.C	2011-03-03 10:13:39.000000000 +0100
@@ -0,0 +1,11 @@ 
+// PR c/47963
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+void
+foo (float n)
+{
+  int A[n][n];	// { dg-error "has non-integral type" }
+#pragma omp parallel private(A)
+  ;
+}