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

[Serialization] Improve extensions of nested types with the same name (#7397)

Browse Source 
Previously looking up an extension would result in all extensions for
types with the same name (nested or not) being deserialized; this
could even bring in base types that had not been deserialized yet. Add
in a string to distinguish an extension's base type; in the top-level
case this is just a module name, but for nested types it's a full
mangled name.

This is a little heavier than I'd like it to be, since it means we
mangle names and then throw them away, and since it means there's a
whole bunch of extra string data in the module just for uniquely
identifying a declaration. But it's correct, and does less work than
before, and fixes a circularity issue with a nested type A.B.A that
apparently used to work.

https://bugs.swift.org/browse/SR-3915
This commit is contained in:
Jordan Rose
2017-02-13 12:42:12 -08:00
committed by GitHub
parent 542638d712
commit c86f8e7089
11 changed files with 301 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/Serialization/xref-extensions.swift Normal file
View File

@@ -0,0 +1,33 @@
// RUN: rm -rf %t && mkdir -p %t
// This check uses -parse-stdlib in order to have an exact count of declarations
// imported.
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_xref_extensions.swift -parse-stdlib
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_xref_extensions_distraction.swift -parse-stdlib
// RUN: %target-swift-frontend -I %t -typecheck %s -parse-stdlib -print-stats 2>&1 -D CHECK_NESTED | %FileCheck %s -check-prefix CHECK_NESTED
// RUN: %target-swift-frontend -I %t -typecheck %s -parse-stdlib -print-stats 2>&1 | %FileCheck %s -check-prefix CHECK_NON_NESTED
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_xref_extensions.swift -parse-stdlib -DEXTRA
// RUN: %target-swift-frontend -I %t -typecheck %s -parse-stdlib -print-stats 2>&1 -D CHECK_NESTED | %FileCheck %s -check-prefix CHECK_NESTED
// RUN: %target-swift-frontend -I %t -typecheck %s -parse-stdlib -print-stats 2>&1 | %FileCheck %s -check-prefix CHECK_NON_NESTED
// REQUIRES: asserts
// CHECK_NESTED-LABEL: Statistics
// CHECK_NESTED: 9 Serialization - # of decls deserialized
// outer struct, initializer + self param,
// inner struct, initializer + self param,
// extension, func + self param
// CHECK_NON_NESTED-LABEL: Statistics
// CHECK_NON_NESTED: 6 Serialization - # of decls deserialized
// struct, initializer + self param, extension, func + self param
import def_xref_extensions
import def_xref_extensions_distraction
#if CHECK_NESTED
Outer.InterestingValue.foo()
#else
def_xref_extensions_distraction.InterestingValue.bar()
#endif