Skip to content

Commit 5788e7f

Browse files
committed
---
yaml --- r: 349490 b: refs/heads/master-next c: 3622f6d h: refs/heads/master
1 parent d14b6cb commit 5788e7f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
3-
refs/heads/master-next: da3fbf87b9de0bb7f9bfd2ca083a11e91df0170e
3+
refs/heads/master-next: 3622f6d7b624458e6060cddc8e1b076eb5fca740
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/AST/ASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2249,7 +2249,7 @@ TypeAliasType *TypeAliasType::get(TypeAliasDecl *typealias, Type parent,
22492249
return result;
22502250

22512251
// Build a new type.
2252-
auto *genericSig = typealias->getGenericSignature();
2252+
auto *genericSig = substitutions.getGenericSignature();
22532253
auto size = totalSizeToAlloc<Type, SubstitutionMap>(parent ? 1 : 0,
22542254
genericSig ? 1 : 0);
22552255
auto mem = ctx.Allocate(size, alignof(TypeAliasType), arena);

0 commit comments

Comments
 (0)