Merge 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd and 87dac7da68ea1e0adac78c59ef1891dcf9632b67 into LLVM 10.0.1

[Meinersbur]

Bugzilla Link	45417
Resolution	FIXED
Resolved on	Jun 17, 2020 17:50
Version	10.0
OS	Windows NT
Blocks	#44654
CC	@serge-sans-paille,@tstellar
Fixed by commit(s)	d21664c 87dac7d 3a0f6e6 f149195 7831c48 4b932da

Extended Description

These fix LLVM builds with Polly as confirmed by NixOS/nixpkgs#81819

[Meinersbur]

assigned to @serge-sans-paille

[tstellar]

Is this related to bug #​44870?

[Meinersbur]

These are the fixes by sguelton@redhat.com as discussed in #120

The current discussion in bug #​44870 reported by Timo Aaltonen/Jan Palus is a different issue with similar symptoms.

[tstellar]

These patches don't backport cleanly. Can you attach patches to this bug that apply cleanly?

[Meinersbur]

git-format patches for release/10.x merges

[Meinersbur]

The following order worked for me:

$ git cherry-pick d21664c
$ git cherry-pick 87dac7d
$ git cherry-pick 3a0f6e6

I wasn't aware that the dependency d21664 also wasn't merged yet. Anyway, I attached the result as git format-patch

[tstellar]

Serge, are these safe to backport?

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

[tstellar]

Merged: 4b932da