Page MenuHomeFreeBSD
Differential D29679

contrib/flex: Drop local __dead2 patch
ClosedPublic
Actions

Authored by arichardson on Apr 9 2021, 4:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Oct 29, 12:50 PM
Unknown Object (File)
Oct 11 2024, 3:14 AM
Unknown Object (File)
Oct 4 2024, 8:27 AM
Unknown Object (File)
Oct 1 2024, 2:08 PM
Unknown Object (File)
Sep 27 2024, 11:52 AM
Unknown Object (File)
Sep 27 2024, 7:12 AM
Unknown Object (File)
Sep 25 2024, 9:13 AM
Unknown Object (File)
Sep 24 2024, 7:47 AM
View All Files
Subscribers
imp

Details

Reviewers
jkim
Commits
rG25fb1c01f86e: contrib/flex: Drop local __dead2 patch
rGd37f81e35b6e: contrib/flex: Drop local __dead2 patch
rGbbd421cdf6d8: contrib/flex: Drop local __dead2 patch
Summary

Upstream flex has added a yynoreturn, so this diff is no longer needed.
Partially reverts r181269. Also re-generate the pre-generated files that
are used for bootstrapping.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

arichardson created this revision.Apr 9 2021, 4:43 PM
Herald added a subscriber: imp. · View Herald TranscriptApr 9 2021, 4:43 PM
arichardson requested review of this revision.Apr 9 2021, 4:43 PM
Harbormaster completed remote builds in B38460: Diff 87124.Apr 9 2021, 4:43 PM
arichardson updated this revision to Diff 87125.Apr 9 2021, 4:45 PM

Update some pre-generated files

Harbormaster completed remote builds in B38461: Diff 87125.Apr 9 2021, 4:45 PM
arichardson updated this revision to Diff 87373.Apr 13 2021, 12:25 PM

re-generate bootstrap files

Harbormaster completed remote builds in B38557: Diff 87373.Apr 13 2021, 12:25 PM
arichardson edited the summary of this revision. (Show Details)Apr 13 2021, 12:26 PM
arichardson added a comment.Apr 19 2021, 1:28 PM

ping?

jkim added a comment.Apr 19 2021, 5:50 PM

Sorry, I was going to take a look at this today. BTW, there is D28596.

arichardson added a comment.Apr 19 2021, 6:14 PM
In D29679#669604, @jkim wrote:

Sorry, I was going to take a look at this today. BTW, there is D28596.

Ah thanks, I didn't see that review. I can rebase on top of that one if you would like?

jkim added a comment.Apr 19 2021, 6:18 PM
In D29679#669618, @arichardson wrote:
In D29679#669604, @jkim wrote:

Sorry, I was going to take a look at this today. BTW, there is D28596.

Ah thanks, I didn't see that review. I can rebase on top of that one if you would like?

I am going to commit the D28596 in a minute. Please rebase after that.

jkim added a comment.Apr 19 2021, 6:45 PM

D28596 is committed. Please rebase.

arichardson updated this revision to Diff 87730.Apr 19 2021, 6:48 PM

rebase after D28596

Harbormaster completed remote builds in B38692: Diff 87730.Apr 19 2021, 6:48 PM
arichardson added a comment.EditedApr 19 2021, 7:00 PM

I can commit the regeneration of inittokenizer.c separately, so that this commit only includes the __dead2 change?

jkim added inline comments.Apr 19 2021, 7:05 PM
contrib/flex/src/parse.y
35 ↗(On Diff #87730)

Please do not pollute the vendor code with the SPDX tag.

arichardson updated this revision to Diff 87733.Apr 19 2021, 7:05 PM

drop SPDX tag

Harbormaster completed remote builds in B38693: Diff 87733.Apr 19 2021, 7:05 PM
jkim added a comment.Apr 19 2021, 7:09 PM
In D29679#669649, @arichardson wrote:

I can commit the regeneration of inittokenizer.c separately, so that this commit only includes the __dead2 change?

Please commit contrib/flex/src/flex.skl first, usr.bin/lex/initscan.c and usr.bin/lex/initskel.c next, then tools/build/bootstrap-m4/inittokenizer.c last.

jkim accepted this revision.Apr 19 2021, 7:10 PM

LGTM

This revision is now accepted and ready to land.Apr 19 2021, 7:10 PM
Closed by commit rGbbd421cdf6d8: contrib/flex: Drop local __dead2 patch (authored by arichardson). · Explain WhyApr 20 2021, 12:47 AM
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rGbbd421cdf6d8: contrib/flex: Drop local __dead2 patch.
jkim added a comment.Apr 20 2021, 2:40 AM

I guess you missed this comment. :-(

In D29679#669656, @jkim wrote:

Please commit contrib/flex/src/flex.skl first, usr.bin/lex/initscan.c and usr.bin/lex/initskel.c next, then tools/build/bootstrap-m4/inittokenizer.c last.

arichardson added a comment.Apr 20 2021, 8:42 AM
In D29679#669899, @jkim wrote:

I guess you missed this comment. :-(

In D29679#669656, @jkim wrote:

Please commit contrib/flex/src/flex.skl first, usr.bin/lex/initscan.c and usr.bin/lex/initskel.c next, then tools/build/bootstrap-m4/inittokenizer.c last.

Sorry about that! I only saw the last comment and somehow missed that one. I can revert and re-land separately if you prefer?

jkim added a comment.Apr 20 2021, 2:03 PM
In D29679#669969, @arichardson wrote:

Sorry about that! I only saw the last comment and somehow missed that one. I can revert and re-land separately if you prefer?

Please do. Thanks!

arichardson added a reverting change: rG3bca8d2b3270: Revert "contrib/flex: Drop local __dead2 patch".Apr 21 2021, 9:58 AM
arichardson added a commit: rGd37f81e35b6e: contrib/flex: Drop local __dead2 patch.
arichardson added a commit: rG25fb1c01f86e: contrib/flex: Drop local __dead2 patch.May 11 2021, 10:31 AM

Revision Contents
Changeset List

PathSize
contrib/
flex/
src/
8 lines
tools/
build/
bootstrap-m4/
414 lines
usr.bin/
lex/
16 lines
8 lines

Diff 87761

View Options

contrib/flex/src/flex.skl

Loading...
View Options

tools/build/bootstrap-m4/inittokenizer.c

Loading...
View Options

usr.bin/lex/initscan.c

Loading...
View Options

usr.bin/lex/initskel.c

Loading...