diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2021-05-02 14:17:23 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2021-05-02 14:17:23 +0200 |
| commit | 7911a905276781c20f704f5a91b5125e0184d072 (patch) | |
| tree | 8216af68d798686182e10374f9dfb3916db1b38f | |
| parent | 6e1ecc984ef71fc80d0fb7e91ac38af16ccb1943 (diff) | |
| download | gcc-7911a905276781c20f704f5a91b5125e0184d072.zip gcc-7911a905276781c20f704f5a91b5125e0184d072.tar.gz gcc-7911a905276781c20f704f5a91b5125e0184d072.tar.bz2 | |
nvptx: Fix up nvptx build against latest libstdc++ [PR100375]
The r12-220-gd96db15967e78d7cecea3b1cf3169ceb924678ac change
deprecated some non-standard std::pair constructors and that apparently
broke nvptx.c build, where pseudo_node_t is std::pair<struct basic_block_def *, int>
and so nullptr (or NULL) needs to be used for the first argument of the
ctors instead of 0.
2021-05-02 Jakub Jelinek <jakub@redhat.com>
PR target/100375
* config/nvptx/nvptx.c (nvptx_sese_pseudo): Use nullptr instead of 0
as first argument of pseudo_node_t constructors.
| -rw-r--r-- | gcc/config/nvptx/nvptx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 794c5a6..7a7a913 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -3682,9 +3682,9 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, edge e; edge_iterator ei; int hi_back = depth; - pseudo_node_t node_back (0, depth); + pseudo_node_t node_back (nullptr, depth); int hi_child = depth; - pseudo_node_t node_child (0, depth); + pseudo_node_t node_child (nullptr, depth); basic_block child = NULL; unsigned num_children = 0; int usd = -dir * sese->dir; @@ -3751,7 +3751,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, else { /* Fallen off graph, backlink to entry node. */ hi_back = 0; - node_back = pseudo_node_t (0, 0); + node_back = pseudo_node_t (nullptr, 0); } } @@ -3772,7 +3772,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, else { /* back edge to entry node */ - sese->push (pseudo_node_t (0, 0)); + sese->push (pseudo_node_t (nullptr, 0)); } } @@ -3781,7 +3781,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, if (!sese->brackets.length () || !edges || !edges->length ()) { hi_back = 0; - node_back = pseudo_node_t (0, 0); + node_back = pseudo_node_t (nullptr, 0); sese->push (node_back); } |