Backport D77796, "[LLD] [COFF] Fix alignment of thunks for ARM/ARM64", to 10.0.1

[mstorsjo]

Bugzilla Link	45536
Resolution	FIXED
Resolved on	Jun 17, 2020 17:50
Version	unspecified
OS	All
Blocks	#44654
CC	@amccarth-google,@tstellar
Fixed by commit(s)	12c9e2f 783f5c6

Extended Description

I think https://reviews.llvm.org/D77796 / https://reviews.llvm.org/rG12c9e2f1110a4fc73562214cf5dd0194b31e87cf is a good candidate for backporting to 10.0.1.

Unfortunately the testcase won't apply cleanly, but see e.g. https://reviews.llvm.org/D77796?id=256271 for what the original form of the patch looked like, before a change to the disassembly format - or I can help doing the cherrypicking.

[mstorsjo]

assigned to @rui314

[tstellar]

Could you attach a patch that applies cleanly to the release/10.x branch?

[mstorsjo]

Backported patch
Here's a backported version of the commit.

I didn't actually test build and run it on the 10.x branch yet, as I don't have a freshly built tree of that branch, so building in order to run the tests would take a long time right now - I can do that tomorrow - or just make sure check-lld passes before pushing it anywhere.

[tstellar]

Created attachment 23379 [details]
Backported patch

Here's a backported version of the commit.

I didn't actually test build and run it on the 10.x branch yet, as I don't
have a freshly built tree of that branch, so building in order to run the
tests would take a long time right now - I can do that tomorrow - or just
make sure check-lld passes before pushing it anywhere.

That's fine. I have pre and post commit testing automated for the release branch with github actions, so I will make sure the tests pass.

[tstellar]

I'm seeing check-lld failures when I apply the patch: https://github.com/tstellar/llvm-project/pull/114/checks?check_run_id=630911361

[mstorsjo]

I'm seeing check-lld failures when I apply the patch:
tstellar#114
checks?check_run_id=630911361

Oops, sorry about that, I had missed one detail in the conflict fixup when backporting it. I'll attach a new version that I've now had time to test myself as well.

[mstorsjo]

Tested backported patch

[tstellar]

Rui, is this OK to backport?

https://github.com/tstellar/llvm-project/pull/114/files

[mstorsjo]

I see this one isn't merged yet, as Rui hasn't responded on whether he thinks the backport is ok.

As Rui isn't too active at the moment, and Reid is on leave, I'm CC:ing Adrian for an ack for backporting this one.

[amccarth-google]

I don't have much domain knowledge here (LLD and ARM), but this looks good to me.

[tstellar]

Merged: 783f5c6