summarylogtreecommitdiffstats
path: root/clang7-compat.patch
diff options
context:
space:
mode:
authorMichael Hansen2018-11-14 13:28:04 -0800
committerMichael Hansen2018-11-14 13:28:04 -0800
commit1c0e0fe700d94ccacbf4f443a1f43c5860eb1f97 (patch)
tree66b0fddde6cb2a998010e333f33dee37c3f8a442 /clang7-compat.patch
parent007a04f705ef041caffe743a85f2169d2c359466 (diff)
downloadaur-1c0e0fe700d94ccacbf4f443a1f43c5860eb1f97.tar.gz
Update to 4.2.1 including patch for Clang 7.0
Diffstat (limited to 'clang7-compat.patch')
-rw-r--r--clang7-compat.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/clang7-compat.patch b/clang7-compat.patch
new file mode 100644
index 000000000000..c4b91cb3988b
--- /dev/null
+++ b/clang7-compat.patch
@@ -0,0 +1,19 @@
+diff -rupN a/include/swift/Reflection/TypeRef.h b/include/swift/Reflection/TypeRef.h
+--- a/include/swift/Reflection/TypeRef.h 2018-11-06 08:47:44.273606680 -0800
++++ b/include/swift/Reflection/TypeRef.h 2018-11-06 08:48:57.184403605 -0800
+@@ -48,12 +48,12 @@ enum class TypeRefKind {
+
+ #define FIND_OR_CREATE_TYPEREF(Allocator, TypeRefTy, ...) \
+ auto ID = Profile(__VA_ARGS__); \
+- const auto Entry = Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.find(ID); \
+- if (Entry != Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.end()) \
++ const auto Entry = Allocator.TypeRefTy##s.find(ID); \
++ if (Entry != Allocator.TypeRefTy##s.end()) \
+ return Entry->second; \
+ const auto TR = \
+ Allocator.DEPENDENT_TEMPLATE makeTypeRef<TypeRefTy>(__VA_ARGS__); \
+- Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.insert({ID, TR}); \
++ Allocator.TypeRefTy##s.insert({ID, TR}); \
+ return TR;
+
+ /// An identifier containing the unique bit pattern made up of all of the