averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Deserialization] Weakened DeclContext asssertion in maybeReadGenericParams.

Browse Source 
An over-eager assertion in ModuleFile::maybeReadGenericParams() rejected
deserialization into the context of a generic subscript for a generic
parameter within one of its accessors. Weaken the assertion; the
DeclContext of the generic parameter will be overwritten with the
correct context later.

Fixes rdar://problem/37408205.
This commit is contained in:
Doug Gregor
2018-02-12 11:57:28 -08:00
parent 3888b5b054
commit ba8e86d2fb
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/Deserialization.cpp
View File

@@ -738,7 +738,8 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
// precede SIL linkage, we should be ok. // precede SIL linkage, we should be ok.
assert((genericParam->getDeclContext()->isModuleScopeContext() || assert((genericParam->getDeclContext()->isModuleScopeContext() ||
DC->isModuleScopeContext() || DC->isModuleScopeContext() ||
genericParam->getDeclContext() == DC) && genericParam->getDeclContext() == DC ||
genericParam->getDeclContext()->isChildContextOf(DC)) &&
"Mismatched decl context for generic types."); "Mismatched decl context for generic types.");
params.push_back(genericParam); params.push_back(genericParam);
break; break;

4
test/SIL/Serialization/Inputs/def_generic.swift
View File

@@ -10,4 +10,8 @@ public class A<T> {
@_versioned @_versioned
@_inlineable @_inlineable
init() {} init() {}
@_inlineable public subscript<U>(value: T) -> U? {
return nil
}
} }