Skip to content

Include PR16372 in swift-4.2-branch to support Clang 7.0+ (Ubuntu 18.10) #23154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2019
Merged

Include PR16372 in swift-4.2-branch to support Clang 7.0+ (Ubuntu 18.10) #23154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/swift/Reflection/TypeRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down