---

yaml
---
r: 335615
b: refs/heads/rxwei-patch-1
c: 0366343
h: refs/heads/master
i:
  335613: cd4c801
  335611: d99e273
  335607: 0786837
  335599: e4d6a59
  335583: 14b6bf4
  335551: da831c1
  335487: 3be7452
  335359: 64e8926

Author: jrose-apple

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 93616cd49ee86d42b343617cefc9eb61ff108627
+refs/heads/rxwei-patch-1: 0366343681e8c93c009350e484c2e5d6b0169051
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/PrintOptions.h

@@ -185,6 +185,12 @@ struct PrintOptions {
   /// type might be ambiguous.
   bool FullyQualifiedTypesIfAmbiguous = false;
 
+  /// If true, printed module names will use the "exported" name, which may be
+  /// different from the regular name.
+  ///
+  /// \see FileUnit::getExportedModuleName
+  bool UseExportedModuleNames = false;
+
   /// Print Swift.Array and Swift.Optional with sugared syntax
   /// ([] and ?), even if there are no sugar type nodes.
   bool SynthesizeSugarOnTypes = false;

branches/rxwei-patch-1/lib/AST/ASTPrinter.cpp

@@ -99,6 +99,7 @@ PrintOptions PrintOptions::printParseableInterfaceFile() {
   result.TypeDefinitions = true;
   result.PrintIfConfig = false;
   result.FullyQualifiedTypes = true;
+  result.UseExportedModuleNames = true;
   result.AllowNullTypes = false;
   result.SkipImports = true;
   result.OmitNameOfInaccessibleProperties = true;
@@ -3342,8 +3343,14 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
 
   template <typename T>
   void printModuleContext(T *Ty) {
-    ModuleDecl *Mod = Ty->getDecl()->getModuleContext();
-    Printer.printModuleRef(Mod, Mod->getName());
+    FileUnit *File = cast<FileUnit>(Ty->getDecl()->getModuleScopeContext());
+    ModuleDecl *Mod = File->getParentModule();
+
+    Identifier Name = Mod->getName();
+    if (Options.UseExportedModuleNames)
+      Name = Mod->getASTContext().getIdentifier(File->getExportedModuleName());
+
+    Printer.printModuleRef(Mod, Name);
     Printer << ".";
   }
 

branches/rxwei-patch-1/test/ParseableInterface/Inputs/exported-module-name-after/CoreKit.h

@@ -0,0 +1 @@
+#import <ExportAsCoreKit.h>

branches/rxwei-patch-1/test/ParseableInterface/Inputs/exported-module-name-after/ExportAsCoreKit.h

@@ -0,0 +1,3 @@
+struct CKThing {
+  long value;
+};

branches/rxwei-patch-1/test/ParseableInterface/Inputs/exported-module-name-after/module.modulemap

@@ -0,0 +1,5 @@
+module CoreKit {
+  header "CoreKit.h"
+  header "ExportAsCoreKit.h"
+  export *
+}

branches/rxwei-patch-1/test/ParseableInterface/Inputs/exported-module-name-before/CoreKit.h

@@ -0,0 +1 @@
+#import <ExportAsCoreKit.h>

branches/rxwei-patch-1/test/ParseableInterface/Inputs/exported-module-name-before/ExportAsCoreKit.h

@@ -0,0 +1,3 @@
+struct CKThing {
+  long value;
+};

branches/rxwei-patch-1/test/ParseableInterface/Inputs/exported-module-name-before/module.modulemap

@@ -0,0 +1,10 @@
+module CoreKit {
+  header "CoreKit.h"
+  export *
+}
+
+module ExportAsCoreKit_BAD {
+  header "ExportAsCoreKit.h"
+  export_as CoreKit
+  export *
+}

branches/rxwei-patch-1/test/ParseableInterface/exported-module-name.swift

@@ -0,0 +1,19 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/CoreKitClient.swiftinterface -module-name CoreKitClient -I %S/Inputs/exported-module-name-before %s
+// RUN: %FileCheck -implicit-check-not BAD %s < %t/CoreKitClient.swiftinterface
+
+// Test that we can rebuild it even when the "export as" module goes away.
+// RUN: %target-swift-frontend -build-module-from-parseable-interface -o %t/CoreKitClient.swiftmodule -I %S/Inputs/exported-module-name-after %t/CoreKitClient.swiftinterface
+
+// CHECK: import CoreKit
+import CoreKit
+
+// CHECK-LABEL: public struct CKThingWrapper : RawRepresentable {
+public struct CKThingWrapper: RawRepresentable {
+  public var rawValue: CKThing
+  public init(rawValue: CKThing) {
+    self.rawValue = rawValue
+  }
+  // Note that this is CoreKit.CKThing, not ExportAsCoreKit.CKThing
+  // CHECK: public typealias RawValue = CoreKit.CKThing
+} // CHECK: {{^}$}}