# [PATCH] reftable: avoid initializing structs from structs 7 messages from 2022-01-13 to 2022-01-17. Participants: Han-Wen Nienhuys via GitGitGadget, Ævar Arnfjörð Bjarmason, Han-Wen Nienhuys, Junio C Hamano. Thread: https://gitlist.dev/t/57237 ## Han-Wen Nienhuys via GitGitGadget, 2022-01-13 16:55 Subject: [PATCH] reftable: avoid initializing structs from structs Message-ID: URL: https://gitlist.dev/e/pull.1188.git.git.1642092934523.gitgitgadget%40gmail.com ``` From: Han-Wen Nienhuys Apparently, the IBM xlc compiler doesn't like this. Signed-off-by: Han-Wen Nienhuys --- reftable: avoid initializing structs from structs Apparently, the IBM xlc compiler doesn't like this. Signed-off-by: Han-Wen Nienhuys hanwen@google.com Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1188%2Fhanwen%2Freftable-xlc-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1188/hanwen/reftable-xlc-v1 Pull-Request: https://github.com/git/git/pull/1188 reftable/merged_test.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/reftable/merged_test.c b/reftable/merged_test.c index 24461e8a802..abd34849fca 100644 --- a/reftable/merged_test.c +++ b/reftable/merged_test.c @@ -207,11 +207,11 @@ static void test_merged(void) }, }; - struct reftable_ref_record want[] = { - r2[0], - r1[1], - r3[0], - r3[1], + struct reftable_ref_record *want[] = { + &r2[0], + &r1[1], + &r3[0], + &r3[1], }; struct reftable_ref_record *refs[] = { r1, r2, r3 }; @@ -250,7 +250,7 @@ static void test_merged(void) EXPECT(ARRAY_SIZE(want) == len); for (i = 0; i < len; i++) { - EXPECT(reftable_ref_record_equal(&want[i], &out[i], + EXPECT(reftable_ref_record_equal(want[i], &out[i], GIT_SHA1_RAWSZ)); } for (i = 0; i < len; i++) { @@ -345,10 +345,10 @@ static void test_merged_logs(void) .value_type = REFTABLE_LOG_DELETION, }, }; - struct reftable_log_record want[] = { - r2[0], - r3[0], - r1[1], + struct reftable_log_record *want[] = { + &r2[0], + &r3[0], + &r1[1], }; struct reftable_log_record *logs[] = { r1, r2, r3 }; @@ -387,7 +387,7 @@ static void test_merged_logs(void) EXPECT(ARRAY_SIZE(want) == len); for (i = 0; i < len; i++) { - EXPECT(reftable_log_record_equal(&want[i], &out[i], + EXPECT(reftable_log_record_equal(want[i], &out[i], GIT_SHA1_RAWSZ)); } base-commit: 1ffcbaa1a5f10c9f706314d77f88de20a4a498c2 -- gitgitgadget ``` ## Ævar Arnfjörð Bjarmason, 2022-01-13 17:13 Subject: Re: [PATCH] reftable: avoid initializing structs from structs Message-ID: <220113.86r19btv5a.gmgdl@evledraar.gmail.com> URL: https://gitlist.dev/e/220113.86r19btv5a.gmgdl%40evledraar.gmail.com In-Reply-To: ``` On Thu, Jan 13 2022, Han-Wen Nienhuys via GitGitGadget wrote: > From: Han-Wen Nienhuys Ah, nevermind <220113.86v8yntxfb.gmgdl@evledraar.gmail.com>, so you meant *want[] :) I can confirm that this works on the xlc version that errored on this before, the reftable tests even pass! > Apparently, the IBM xlc compiler doesn't like this. Would make sense to steal the compiler version etc. details from my . I.e. eventually we'll be able to change this & other code back, as nobody will care about that older compiler version. It worked before in the pre-image on a more recent xlc. > Signed-off-by: Han-Wen Nienhuys > --- > reftable: avoid initializing structs from structs > > Apparently, the IBM xlc compiler doesn't like this. > > Signed-off-by: Han-Wen Nienhuys hanwen@google.com > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1188%2Fhanwen%2Freftable-xlc-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1188/hanwen/reftable-xlc-v1 > Pull-Request: https://github.com/git/git/pull/1188 > > reftable/merged_test.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/reftable/merged_test.c b/reftable/merged_test.c > index 24461e8a802..abd34849fca 100644 > --- a/reftable/merged_test.c > +++ b/reftable/merged_test.c > @@ -207,11 +207,11 @@ static void test_merged(void) > }, > }; > > - struct reftable_ref_record want[] = { > - r2[0], > - r1[1], > - r3[0], > - r3[1], > + struct reftable_ref_record *want[] = { > + &r2[0], > + &r1[1], > + &r3[0], > + &r3[1], > }; > > struct reftable_ref_record *refs[] = { r1, r2, r3 }; > @@ -250,7 +250,7 @@ static void test_merged(void) > > EXPECT(ARRAY_SIZE(want) == len); > for (i = 0; i < len; i++) { > - EXPECT(reftable_ref_record_equal(&want[i], &out[i], > + EXPECT(reftable_ref_record_equal(want[i], &out[i], > GIT_SHA1_RAWSZ)); > } > for (i = 0; i < len; i++) { > @@ -345,10 +345,10 @@ static void test_merged_logs(void) > .value_type = REFTABLE_LOG_DELETION, > }, > }; > - struct reftable_log_record want[] = { > - r2[0], > - r3[0], > - r1[1], > + struct reftable_log_record *want[] = { > + &r2[0], > + &r3[0], > + &r1[1], > }; > > struct reftable_log_record *logs[] = { r1, r2, r3 }; > @@ -387,7 +387,7 @@ static void test_merged_logs(void) > > EXPECT(ARRAY_SIZE(want) == len); > for (i = 0; i < len; i++) { > - EXPECT(reftable_log_record_equal(&want[i], &out[i], > + EXPECT(reftable_log_record_equal(want[i], &out[i], > GIT_SHA1_RAWSZ)); > } > > > base-commit: 1ffcbaa1a5f10c9f706314d77f88de20a4a498c2 ``` ## Han-Wen Nienhuys, 2022-01-13 17:40 Subject: Re: [PATCH] reftable: avoid initializing structs from structs Message-ID: URL: https://gitlist.dev/e/CAFQ2z_Nng6woxKVCpGzL95EOkuBFMQW7FtCTJfyaAZaZ-HMQcA%40mail.gmail.com In-Reply-To: <220113.86r19btv5a.gmgdl@evledraar.gmail.com> ``` On Thu, Jan 13, 2022 at 6:14 PM Ævar Arnfjörð Bjarmason wrote: > I can confirm that this works on the xlc version that errored on this > before, the reftable tests even pass! > > > Apparently, the IBM xlc compiler doesn't like this. > > Would make sense to steal the compiler version etc. details from my > . I.e. eventually > we'll be able to change this & other code back, as nobody will care > about that older compiler version. It worked before in the pre-image on > a more recent xlc. Feel free to butcher this in any way you like for your series. :) -- Han-Wen Nienhuys - Google Munich I work 80%. Don't expect answers from me on Fridays. -- Google Germany GmbH, Erika-Mann-Strasse 33, 80636 Munich Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Paul Manicle, Halimah DeLaine Prado ``` ## Junio C Hamano, 2022-01-13 19:15 Subject: Re: [PATCH] reftable: avoid initializing structs from structs Message-ID: URL: https://gitlist.dev/e/xmqqy23jh2h3.fsf%40gitster.g In-Reply-To: <220113.86r19btv5a.gmgdl@evledraar.gmail.com> ``` Ævar Arnfjörð Bjarmason writes: > Would make sense to steal the compiler version etc. details from my > . I.e. eventually > we'll be able to change this & other code back, as nobody will care > about that older compiler version. It worked before in the pre-image on > a more recent xlc. If so, wouldn't it be a better option not to worry about such an old compiler at all from the get-go? Even with an unnecessary "turn an array of structs into an array of pointers to structs", the resulting code becomes less natural to follow. And after all, this may be part of our tree but is not yet integrated with our system, no? Thanks. ``` ## Junio C Hamano, 2022-01-13 20:00 Subject: Re: [PATCH] reftable: avoid initializing structs from structs Message-ID: URL: https://gitlist.dev/e/xmqqtue7h0dd.fsf%40gitster.g In-Reply-To: ``` Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >> Would make sense to steal the compiler version etc. details from my >> . I.e. eventually >> we'll be able to change this & other code back, as nobody will care >> about that older compiler version. It worked before in the pre-image on >> a more recent xlc. > > If so, wouldn't it be a better option not to worry about such an old > compiler at all from the get-go? The above was a genuine question. If that "nobody will care about the old compiler" will happen only after a few years, then it may not work to just ignore the version of xlc which might still have a meaningful number of users. I just am not in a good position to judge that. Thanks. ``` ## Han-Wen Nienhuys, 2022-01-17 13:07 Subject: Re: [PATCH] reftable: avoid initializing structs from structs Message-ID: URL: https://gitlist.dev/e/CAFQ2z_PNRb6HLUD81%3D_HkRrX0cMLfzz4NmVJaTUQ37EC61MXbg%40mail.gmail.com In-Reply-To: ``` On Thu, Jan 13, 2022 at 9:00 PM Junio C Hamano wrote: > >> Would make sense to steal the compiler version etc. details from my > >> . I.e. eventually > >> we'll be able to change this & other code back, as nobody will care > >> about that older compiler version. It worked before in the pre-image on > >> a more recent xlc. > > > > If so, wouldn't it be a better option not to worry about such an old > > compiler at all from the get-go? > > The above was a genuine question. If that "nobody will care about > the old compiler" will happen only after a few years, then it may > not work to just ignore the version of xlc which might still have > a meaningful number of users. I just am not in a good position to > judge that. I'm all for not worrying too much about ancient compilers, but there is no downside to this patch, so it seems fine to let this one go through. -- Han-Wen Nienhuys - Google Munich I work 80%. Don't expect answers from me on Fridays. -- Google Germany GmbH, Erika-Mann-Strasse 33, 80636 Munich Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Paul Manicle, Halimah DeLaine Prado ``` ## Junio C Hamano, 2022-01-17 19:08 Subject: Re: [PATCH] reftable: avoid initializing structs from structs Message-ID: URL: https://gitlist.dev/e/xmqqpmoquqng.fsf%40gitster.g In-Reply-To: ``` Han-Wen Nienhuys writes: > On Thu, Jan 13, 2022 at 9:00 PM Junio C Hamano wrote: >> >> Would make sense to steal the compiler version etc. details from my >> >> . I.e. eventually >> >> we'll be able to change this & other code back, as nobody will care >> >> about that older compiler version. It worked before in the pre-image on >> >> a more recent xlc. >> > >> > If so, wouldn't it be a better option not to worry about such an old >> > compiler at all from the get-go? >> >> The above was a genuine question. If that "nobody will care about >> the old compiler" will happen only after a few years, then it may >> not work to just ignore the version of xlc which might still have >> a meaningful number of users. I just am not in a good position to >> judge that. > > I'm all for not worrying too much about ancient compilers, but there > is no downside to this patch, so it seems fine to let this one go > through. Yup, I think this already is part of -rc1. Thanks. ```