Fix build with ISL 0.20

Message ID 970626a6-9edd-2c7d-9358-d3bbf2b264f5@att.net
State New
Headers show
Series
  • Fix build with ISL 0.20
Related show

Commit Message

Alexey Neyman Sept. 25, 2018, 7:07 p.m.
Hi,

A trivial patch that fixes the build against the latest ISL release, 
0.20. In that release, <isl/space.h> and <isl/id.h> were split in two 
headers each. The <isl/multi.h> (included from <isl/val.h> which is 
included by "graphite.h") now includes <isl/space_types.h> and 
<isl/id_types.h>; <isl/space.h> and <isl/id.h> must be included explicitly.

These headers (<isl/space.h> and <isl/id.h>) are present in all 
supported versions of ISL (0.15 and later).

Bootstrapped on x86_64-pc-linux-gnu.

Regards,
Alexey.

Comments

Jeff Law Sept. 26, 2018, 2:10 p.m. | #1
On 9/25/18 1:07 PM, Alexey Neyman wrote:
> Hi,

> 

> A trivial patch that fixes the build against the latest ISL release,

> 0.20. In that release, <isl/space.h> and <isl/id.h> were split in two

> headers each. The <isl/multi.h> (included from <isl/val.h> which is

> included by "graphite.h") now includes <isl/space_types.h> and

> <isl/id_types.h>; <isl/space.h> and <isl/id.h> must be included explicitly.

> 

> These headers (<isl/space.h> and <isl/id.h>) are present in all

> supported versions of ISL (0.15 and later).

> 

> Bootstrapped on x86_64-pc-linux-gnu.

Thanks for verifying these are in ISL 0.15 and later -- we recommend
0.18 these days, so I think this is fine.

Installed on the trunk.

jeff
Richard Biener Sept. 26, 2018, 2:43 p.m. | #2
On Wed, Sep 26, 2018 at 4:10 PM Jeff Law <law@redhat.com> wrote:
>

> On 9/25/18 1:07 PM, Alexey Neyman wrote:

> > Hi,

> >

> > A trivial patch that fixes the build against the latest ISL release,

> > 0.20. In that release, <isl/space.h> and <isl/id.h> were split in two

> > headers each. The <isl/multi.h> (included from <isl/val.h> which is

> > included by "graphite.h") now includes <isl/space_types.h> and

> > <isl/id_types.h>; <isl/space.h> and <isl/id.h> must be included explicitly.

> >

> > These headers (<isl/space.h> and <isl/id.h>) are present in all

> > supported versions of ISL (0.15 and later).

> >

> > Bootstrapped on x86_64-pc-linux-gnu.

> Thanks for verifying these are in ISL 0.15 and later -- we recommend

> 0.18 these days, so I think this is fine.

>

> Installed on the trunk


I think this was fixed already in August:

2018-08-01  Richard Biener  <rguenther@suse.de>

        PR bootstrap/86724
        * graphite.h: Include isl/id.h and isl/space.h to allow build
        with ISL 0.20.

and also backported to branches.

Richard.

>

> jeff
Jeff Law Sept. 26, 2018, 2:46 p.m. | #3
On 9/26/18 8:43 AM, Richard Biener wrote:
> On Wed, Sep 26, 2018 at 4:10 PM Jeff Law <law@redhat.com> wrote:

>>

>> On 9/25/18 1:07 PM, Alexey Neyman wrote:

>>> Hi,

>>>

>>> A trivial patch that fixes the build against the latest ISL release,

>>> 0.20. In that release, <isl/space.h> and <isl/id.h> were split in two

>>> headers each. The <isl/multi.h> (included from <isl/val.h> which is

>>> included by "graphite.h") now includes <isl/space_types.h> and

>>> <isl/id_types.h>; <isl/space.h> and <isl/id.h> must be included explicitly.

>>>

>>> These headers (<isl/space.h> and <isl/id.h>) are present in all

>>> supported versions of ISL (0.15 and later).

>>>

>>> Bootstrapped on x86_64-pc-linux-gnu.

>> Thanks for verifying these are in ISL 0.15 and later -- we recommend

>> 0.18 these days, so I think this is fine.

>>

>> Installed on the trunk

> 

> I think this was fixed already in August:

> 

> 2018-08-01  Richard Biener  <rguenther@suse.de>

> 

>         PR bootstrap/86724

>         * graphite.h: Include isl/id.h and isl/space.h to allow build

>         with ISL 0.20.

> 

> and also backported to branches.

You're right!  I'll revert.

jeff
Alexey Neyman Sept. 26, 2018, 3:40 p.m. | #4
On 09/26/2018 07:46 AM, Jeff Law wrote:
> On 9/26/18 8:43 AM, Richard Biener wrote:

>> On Wed, Sep 26, 2018 at 4:10 PM Jeff Law <law@redhat.com> wrote:

>>> On 9/25/18 1:07 PM, Alexey Neyman wrote:

>>>> Hi,

>>>>

>>>> A trivial patch that fixes the build against the latest ISL release,

>>>> 0.20. In that release, <isl/space.h> and <isl/id.h> were split in two

>>>> headers each. The <isl/multi.h> (included from <isl/val.h> which is

>>>> included by "graphite.h") now includes <isl/space_types.h> and

>>>> <isl/id_types.h>; <isl/space.h> and <isl/id.h> must be included explicitly.

>>>>

>>>> These headers (<isl/space.h> and <isl/id.h>) are present in all

>>>> supported versions of ISL (0.15 and later).

>>>>

>>>> Bootstrapped on x86_64-pc-linux-gnu.

>>> Thanks for verifying these are in ISL 0.15 and later -- we recommend

>>> 0.18 these days, so I think this is fine.

>>>

>>> Installed on the trunk

>> I think this was fixed already in August:

>>

>> 2018-08-01  Richard Biener  <rguenther@suse.de>

>>

>>          PR bootstrap/86724

>>          * graphite.h: Include isl/id.h and isl/space.h to allow build

>>          with ISL 0.20.

>>

>> and also backported to branches.

> You're right!  I'll revert.


Indeed, sorry for the noise. I noticed that the currently released 
versions failed to build, grepped for <isl/space.h> in trunk - which 
yielded nothing due to a typo. So I just applied the same patch and 
verified it built.

Sorry again,
Alexey.

Patch

From d4f0e6b43aecb4542b1fd6483874ff4cec684f6a Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 24 Sep 2018 22:50:11 -0700
Subject: Fix build with ISL 0.20

	* gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
	headers are no longer pulled in by <isl/val.h>.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 gcc/ChangeLog  | 5 +++++
 gcc/graphite.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6be143e9f18..320e3731932 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@ 
+2018-09-25  Alexey Neyman  <stilor@att.net>
+
+	* gcc/graphite.h: Include <isl/id.h> and <isl/space.h>; these
+	headers are no longer pulled in by <isl/val.h>.
+
 2018-09-25  Richard Biener  <rguenther@suse.de>
 
 	PR debug/83941
diff --git a/gcc/graphite.h b/gcc/graphite.h
index be0a22b3894..8db5700e03f 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -26,6 +26,8 @@  along with GCC; see the file COPYING3.  If not see
 #include <isl/options.h>
 #include <isl/ctx.h>
 #include <isl/val.h>
+#include <isl/id.h>
+#include <isl/space.h>
 #include <isl/set.h>
 #include <isl/union_set.h>
 #include <isl/map.h>
-- 
2.14.1