Merge r315464 into the 5.0 branch: Fix #34916 : Crash on mixing taskloop|tasks directives.

[hahnjo]

Bugzilla Link	35181
Resolution	FIXED
Resolved on	Nov 14, 2017 16:07
Version	unspecified
OS	All
Blocks	#33840
CC	@alexey-bataev,@hfinkel,@tstellar
Fixed by commit(s)	r315464 r318233

Extended Description

If both taskloop and task directives are used at the same time in one
program, we may ran into the situation when the particular type for task
directive is reused for taskloop directives. Patch fixes this problem.

[tstellar]

The new private members that are added to this class need to be moved to the end to avoid breaking the ABI.

[hahnjo]

CGOpenMPRuntime is a private class that is not exported in headers - I thought nobody external should be able to use it?

[tstellar]

My mistake, I didn't notice the header file was in lib. The new members are fine.

Alexy is this OK to merge: https://reviews.llvm.org/rL315464

[alexey-bataev]

Yes

[tstellar]

Merged: r318233