Merge clang r345044, r345038, r345497, r346392 into 7.0.1

[llvmbot]

Bugzilla Link	39737
Resolution	FIXED
Resolved on	Nov 28, 2018 20:37
Version	7.0
OS	Windows NT
Blocks	#38454
Reporter	LLVM Bugzilla Contributor
CC	@zygoloid,@tstellar
Fixed by commit(s)	r345497 r347834

Extended Description

Hi,

I would like to backport(merge request) those OCL fixes to 7.0.1. Is it still possible?

https://reviews.llvm.org/rC345044 - this is a define for an extension
https://reviews.llvm.org/rC345038 - unifies 2 types
https://reviews.llvm.org/rC345497 - serialization fix
https://reviews.llvm.org/rC346392 - an Intel extension

[llvmbot]

assigned to @AnastasiaStulova

[tstellar]

https://reviews.llvm.org/rC345038 - unifies 2 types

This changes the API, so we can't take it for a point release.

https://reviews.llvm.org/rC346392 - an Intel extension

This is too invasive for a point release and probably also changes the ABI.

Anastasia, what do you think about these other two:

https://reviews.llvm.org/rC345497
https://reviews.llvm.org/rC345044

[AnastasiaStulova]

I think both rC345497 and rC345044 are small enough changes. Although rC345044 is adding new functionality and it's not something we typically port to minor releases? I will let you decide about this one.

[tstellar]

Ok, I think I'll just merge r345497.

[tstellar]

Merged: r347834