---

yaml
---
r: 345547
b: refs/heads/master
c: 370f93f
h: refs/heads/master
i:
  345545: 6ec1f0b
  345543: 75931a7

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1ff59f7d73487a1cb1ae2c3638a9f1023ad85fa5
+refs/heads/master: 370f93ff39241bb5b60ffb1f071cbf9b91c8f010
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/IRGen/IRGenMangler.cpp

@@ -87,19 +87,29 @@ IRGenMangler::mangleTypeForReflection(IRGenModule &IGM,
   llvm::SaveAndRestore<std::function<bool (const DeclContext *)>>
     SymbolicReferencesForLocalTypes(CanSymbolicReference);
 
-  if (IGM.CurSourceFile
-      && !isa<ClangModuleUnit>(IGM.CurSourceFile)
+  if ((!IGM.CurSourceFile || !isa<ClangModuleUnit>(IGM.CurSourceFile))
       && !IGM.getOptions().IntegratedREPL) {
     CanSymbolicReference = [&](const DeclContext *dc) -> bool {
+      // Can only symbolically reference nominal type declarations.
+      auto nominal = dyn_cast<NominalTypeDecl>(dc);
+      if (!nominal || isa<ProtocolDecl>(dc))
+        return false;
+
       // Symbolically reference types that are defined in the same file unit
       // as we're referencing from.
-      //
-      // We could eventually improve this to reference any type that ends
+      if (IGM.CurSourceFile &&
+          dc->getModuleScopeContext() == IGM.CurSourceFile)
+        return true;
+
+      // fileprivate and private entities are always in the same file unit
+      // that they're referenced from.
+      if (nominal->getEffectiveAccess() < AccessLevel::Internal)
+        return true;
+
+      // FIXME: We could eventually improve this to reference any type that ends
       // up with its nominal type descriptor in the same linked binary as us,
       // but IRGen doesn't know that with much certainty currently.
-      return dc->getModuleScopeContext() == IGM.CurSourceFile
-        && isa<NominalTypeDecl>(dc)
-        && !isa<ProtocolDecl>(dc);
+      return false;
     };
   }
 

trunk/test/IRGen/associated_type_witness.swift

@@ -12,6 +12,16 @@ protocol Assocked {
 
 struct Universal : P, Q {}
 
+
+// CHECK-LABEL: @"symbolic \01____ 23associated_type_witness12OuterPrivate{{.*}}V" = linkonce_odr hidden constant
+// CHECK-SAME: @"$s23associated_type_witness12OuterPrivate{{.*}}5InnerE0V9InnermostVMn"
+private struct OuterPrivate {
+  struct InnerPrivate: HasSimpleAssoc {
+    struct Innermost { }
+    typealias Assoc = Innermost
+  }
+}
+
 // CHECK: [[ASSOC_TYPE_NAMES:@.*]] = private constant [29 x i8] c"OneAssoc TwoAssoc ThreeAssoc\00"
 // CHECK: @"$s23associated_type_witness18HasThreeAssocTypesMp" =
 // CHECK-SAME: [[ASSOC_TYPE_NAMES]] to i64
@@ -121,7 +131,6 @@ protocol HasSimpleAssoc {
 }
 protocol DerivedFromSimpleAssoc : HasSimpleAssoc {}
 
-
 //   Generic witness table pattern for GenericComputed : DerivedFromSimpleAssoc.
 // GLOBAL-LABEL: @"$s23associated_type_witness15GenericComputedVyxGAA22DerivedFromSimpleAssocAAWp" = internal constant [2 x i8*]
 // GLOBAL-SAME: @"$s23associated_type_witness15GenericComputedVyxGAA22DerivedFromSimpleAssocAAMc"

trunk/test/Runtime/associated_type_demangle_private.swift

@@ -0,0 +1,32 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift -parse-stdlib %s -module-name main -o %t/a.out
+// RUN: %target-codesign %t/a.out
+// RUN: %target-run %t/a.out
+// REQUIRES: executable_test
+
+import Swift
+import StdlibUnittest
+
+protocol P {
+  associatedtype A
+}
+
+fileprivate struct Foo {
+  fileprivate struct Inner: P {
+    fileprivate struct Innermost { }
+    typealias A = Innermost
+  }
+}
+
+func getP_A<T: P>(_: T.Type) -> Any.Type {
+  return T.A.self
+}
+
+let AssociatedTypeDemangleTests = TestSuite("AssociatedTypeDemangle")
+
+
+AssociatedTypeDemangleTests.test("private types") {
+  expectEqual(Foo.Inner.Innermost.self, getP_A(Foo.Inner.self))
+}
+
+runAllTests()