From nobody Wed Nov 15 22:20:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVyKJ4M9zz50pcf for ; Wed, 15 Nov 2023 22:20:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVyKJ2H6zz3HCK for ; Wed, 15 Nov 2023 22:20:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-53dd3f169d8so253410a12.3 for ; Wed, 15 Nov 2023 14:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1700086818; x=1700691618; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=60BXZOlkzDOkrlt4Q26NjoIk1RlOlGJXWDB5F6qrVvY=; b=xpHzpRH7InJYm6hWGcMt2tsykUPM0+wZFj0tZ/J4+ep5/QjWEJ9w93cD12KxjsPFpr IIFNT135kZ0uqGnT+WiH7LbXqPqhzFQztAsiPCD5eWwfxFrsgTDm5Ru7B4V11Jwzgscf coZFaOEYiuKvXfMCdhSHcBQh/0eoIcHMD+PO6dKHlgc/QW3J/sdQiSOyKi2WZyY0Y1sb drfZFfYDymdwPzQKrL6LWYdXTh2cChAffaa11In70gSGJjVwMCbLAYILXmQ94zJzjx3q JjhO/UJLII1WZ5Bhg8bHY4MBLHBvslE6ziiM4VuhN5S4i2RelhhCbtZakOlRZ/H3svDq xWmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700086818; x=1700691618; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=60BXZOlkzDOkrlt4Q26NjoIk1RlOlGJXWDB5F6qrVvY=; b=HBeOtZ7B/VzXp6hjmL1AiBYB6i73qviXxLGYZnjtsROr+TcNokz8QP3SIv7uiaKj9R 8vNDwSJ5Bfj36lWPkJ1p9Hc3FYfDFTTjw42RQsJ9Jfcip0IJml+TwLp6zcdbrf1y9TxJ 5ttjvFhZfHlSXMFP/RT3v4mcUeeuHhwnmmOxuTmhq/ajOIZd+Vo96uX1/yQ6nyZQWlkh a20SbfFI4nhFT671ZL67H2igV47+1EUJEQaBDp1O2OAd3cqaNXTCRHEmt27ldSMWL8WF W4ZLFyIoinP/RVT88x+2/nMuazrQjwbj+VjA1jyhHUJrBo6wkX3rgs/FIq6fUwHdBk3W xhsg== X-Gm-Message-State: AOJu0YzKTYmeSBc0ifNrSHRYy+apotxA8XAuOSrK9eupQL8F+2sEhQk4 BVZ0t96utl7QfO3pEuqjQvcadkeX5mJWMQayFIrWAOWTDGsVfd8xtpw= X-Google-Smtp-Source: AGHT+IG4optzvxh+vfm/8WKnoguf4y6Br1M6sYSonPsG9SLuaE4Is/Uck3EYDtYOnBftvz6hj7ZhnqEzTRI1ZirYq3s= X-Received: by 2002:a05:6402:d8:b0:532:bf2a:8cbc with SMTP id i24-20020a05640200d800b00532bf2a8cbcmr477696edu.16.1700086817662; Wed, 15 Nov 2023 14:20:17 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202311140451.3AE4p5AR014207@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 15 Nov 2023 15:20:06 -0700 Message-ID: Subject: Re: git: 3fd60a6b73ac - main - awk: Merge upstream 2nd Edition Awk Book To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000dab779060a384eee" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SVyKJ2H6zz3HCK --000000000000dab779060a384eee Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Nov 15, 2023 at 3:13=E2=80=AFPM Jessica Clarke = wrote: > On 15 Nov 2023, at 21:59, Warner Losh wrote: > > > > > > > > On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke > wrote: > >> On 14 Nov 2023, at 04:51, Warner Losh wrote: > >> > > >> > The branch main has been updated by imp: > >> > > >> > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f173970= fae4cae73 > >> > > >> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73 > >> > Merge: 194df014feeb 2e406c584fe4 > >> > Author: Warner Losh > >> > AuthorDate: 2023-11-02 16:32:01 +0000 > >> > Commit: Warner Losh > >> > CommitDate: 2023-11-14 04:49:34 +0000 > >> > > >> > awk: Merge upstream 2nd Edition Awk Book > >> > > >> > Merge in the November 2nd, 2023 version of one true awk. > >> > > >> > This brings in Unicode support, CSV support and a number of bug > fixes. > >> > > >> > Sponsored by: Netflix > >> > Reviewed by: delphij > >> > Differential Revision: https://reviews.freebsd.org/D42447 > >> > >> This seems to have broken the GitHub CI for cross-building; contrast: > >> > >> https://github.com/freebsd/freebsd-src/actions/runs/6859373313 > >> > >> with: > >> > >> https://github.com/freebsd/freebsd-src/actions/runs/6859316228 > >> > >> Has this broken makeobjops.awk somehow? If so it should be reproducibl= e > >> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an update= d > >> system. Cross-building will just show it first because we always > >> bootstrap awk there, like many other tools. > > > > It worked when it was the system awk for me... But that might not be > the most > > helpful observation. > > For a clean kernel build? > > > Why didn't it work for you/github's ci runs? > > From GitHub (indentation sadly lost when copying): > > > In file included from > /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam.c:45: > > In file included from > /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam_ccb.h:1052: > > In file included from > /Users/runner/work/freebsd-src/freebsd-src/sys/cam/mmc/mmc_bus.h:4: > > In file included from > /Users/runner/work/freebsd-src/freebsd-src/sys/dev/mmc/bridge.h:57: > > In file included from > /Users/runner/work/freebsd-src/freebsd-src/sys/sys/bus.h:787: > > ./bus_if.h:217:35: error: expected ')' > > int _unit); > > ^ > > ./bus_if.h:216:33: note: to match this '(' > > typedef device_t bus_add_child_t(device_t _dev, u_int _order, const cha= r > *_name > > ^ > > ./bus_if.h:241:41: error: expected ')' > > const char *_name, int _unit) > > ^ > > ./bus_if.h:240:39: note: to match this '(' > > static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order > > ^ > > ... > > Hence the assumption that makeobjops.awk has stopped working properly, > which is highly consistent with this being the first commit to fail in > CI. It looks like we=E2=80=99re missing commas, maybe from format_line. > > I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s a= cross all > macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t. > > > makeobjops.awk doesn't have any of the issues that I know are minor > changes > > in awk. I'll add it to the list of things to look into, though. > > On what timeline? If not soon, can we please revert the import as it=E2= =80=99s > breaking important things and thus not ready for the tree? > I wanted to try to recreate it, or figure out what in the env is causing it to go astray. I also want to confirm your diagnosis that this is coming from this awk and not because we're building it to a weird new name (so all my testing is with the old awk) and thus falling back to using the system's awk... I don't like mysteries.... but if we still have one after spending an hour or two on it, I'll revert. That puts it at anywhere from an hour or two from now, or first thing in the morning worst case (eg, something crazy comes up... though the odds of that are low). Otherwise I'll commit a fix. Warner > Jess > > > I also broke the Jenkins CI run, but not 'make check' for reasons I don= 't > > understand. > > > > Warner > > > --000000000000dab779060a384eee Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Nov 15, 2023 at 3:13=E2=80=AF= PM Jessica Clarke <jrtc27@freebsd.= org> wrote:
On 15 Nov 2023, at 21:59, Warner Losh <imp@bsdimp.com> wrote:
>
>
>
> On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke <jrtc27@freebsd.org> wro= te:
>> On 14 Nov 2023, at 04:51, Warner Losh <imp@FreeBSD.org> wrot= e:
>> >
>> > The branch main has been updated by imp:
>> >
>> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f173970f= ae4cae73
>> >
>> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73
>> > Merge: 194df014feeb 2e406c584fe4
>> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > AuthorDate: 2023-11-02 16:32:01 +0000
>> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > CommitDate: 2023-11-14 04:49:34 +0000
>> >
>> >=C2=A0 =C2=A0 awk: Merge upstream 2nd Edition Awk Book
>> >
>> >=C2=A0 =C2=A0 Merge in the November 2nd, 2023 version of one t= rue awk.
>> >
>> >=C2=A0 =C2=A0 This brings in Unicode support, CSV support and = a number of bug fixes.
>> >
>> >=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
>> >=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 delphij
>> >=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://re= views.freebsd.org/D42447
>>
>> This seems to have broken the GitHub CI for cross-building; contra= st:
>>
>> https://github.com/freebsd/fr= eebsd-src/actions/runs/6859373313
>>
>> with:
>>
>> https://github.com/freebsd/fr= eebsd-src/actions/runs/6859316228
>>
>> Has this broken makeobjops.awk somehow? If so it should be reprodu= cible
>> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an up= dated
>> system. Cross-building will just show it first because we always >> bootstrap awk there, like many other tools.
>
> It worked when it was the system awk for me...=C2=A0 But that might no= t be the most
> helpful observation.

For a clean kernel build?

> Why didn't it work for you/github's ci runs?

From GitHub (indentation sadly lost when copying):

> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/cam.c:45:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/cam_ccb.h:1052:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/mmc/mmc_bus.h:4:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/d= ev/mmc/bridge.h:57:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/s= ys/bus.h:787:
> ./bus_if.h:217:35: error: expected ')'
> int _unit);
> ^
> ./bus_if.h:216:33: note: to match this '('
> typedef device_t bus_add_child_t(device_t _dev, u_int _order, const ch= ar *_name
> ^
> ./bus_if.h:241:41: error: expected ')'
> const char *_name, int _unit)
> ^
> ./bus_if.h:240:39: note: to match this '('
> static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order > ^
> ...

Hence the assumption that makeobjops.awk has stopped working properly,
which is highly consistent with this being the first commit to fail in
CI. It looks like we=E2=80=99re missing commas, maybe from format_line.

I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s acr= oss all
macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t.

> makeobjops.awk doesn't have any of the issues that I know are mino= r changes
> in awk. I'll add it to the list of things to look into, though.
On what timeline? If not soon, can we please revert the import as it=E2=80= =99s
breaking important things and thus not ready for the tree?
=

I wanted to try to recreate it, or figure out what in t= he env is causing it
to go astray. I also want to confirm your di= agnosis that this is coming
from this awk and not because we'= re building it to a weird new name
(so all my testing is with the= old awk) and thus falling back to using
the system's awk...<= /div>

I don't like mysteries.... but if we still hav= e one after spending
an hour or two on it, I'll revert. That = puts it at anywhere from an hour
or two from now, or first thing = in the morning worst case (eg, something
crazy comes up... though= the odds of that are low).=C2=A0 Otherwise I'll
commit a fix= .

Warner
=C2=A0
Jess

> I also broke the Jenkins CI run, but not 'make check' for reas= ons I don't
> understand.
>
> Warner


--000000000000dab779060a384eee--