Merge pull request #4139 from swiftwasm/main

MaxDesiatov · web-flow · commit 5ac9f1d9259b · 2022-01-21T21:12:19.000Z
[pull] swiftwasm from main
diff --git a/CODE_OWNERS.TXT b/CODE_OWNERS.TXT
@@ -75,7 +75,7 @@ D: Debug info
 N: Jordan Rose
 E: jordan_rose@apple.com
 G: jrose-apple
-D: ClangImporter, Serialization, PrintAsObjC, Driver, Frontend
+D: ClangImporter, Serialization, PrintAsClang, Driver, Frontend
 
 N: Daniel Steffen
 E: dsteffen@apple.com
diff --git a/docs/README.md b/docs/README.md
@@ -102,7 +102,7 @@ documentation, please create a thread on the Swift forums under the
 - [DependencyAnalysis.md](/docs/DependencyAnalysis.md):
   Describes different kinds of dependencies across files in the same module,
   important for understanding incremental builds.
-- C and ObjC interoperability: Clang Importer and PrintAsObjC
+- C and ObjC interoperability: Clang Importer and PrintAsClang
   - [CToSwiftNameTranslation.md](/docs/CToSwiftNameTranslation.md):
     Describes how C and ObjC entities are imported into Swift
     by the Clang Importer.
diff --git a/include/swift/AST/DiagnosticsParse.def b/include/swift/AST/DiagnosticsParse.def
@@ -315,6 +315,8 @@ ERROR(decl_expected_module_name,none,
 ERROR(expected_module_alias,none,
       "cannot refer to module as %0 because it has been aliased; use %1 "
       "instead", (Identifier, Identifier))
+ERROR(unexpected_operator_in_import_path,none,
+      "cannot include postfix operator in import declaration",())
 
 // Extension
 ERROR(expected_lbrace_extension,PointsToFirstBadToken,
diff --git a/include/swift/AST/TypeNodes.def b/include/swift/AST/TypeNodes.def
@@ -33,7 +33,7 @@
 ///   process does not necessarily converge to the canonical type, however.
 ///   The default behavior is TYPE(id, parent).
 //
-// If you add a new sugared type, be sure to test it in PrintAsObjC!
+// If you add a new sugared type, be sure to test it in PrintAsClang!
 
 /// UNCHECKED_TYPE(id, parent)
 ///   This type is not present in valid, type-checked programs.
diff --git a/include/swift/Basic/PathRemapper.h b/include/swift/Basic/PathRemapper.h
@@ -35,7 +35,7 @@ namespace swift {
 
 class PathRemapper {
   SmallVector<std::pair<std::string, std::string>, 2> PathMappings;
-
+  friend class PathObfuscator;
 public:
   /// Adds a mapping such that any paths starting with `FromPrefix` have that
   /// portion replaced with `ToPrefix`.
@@ -72,6 +72,11 @@ class PathObfuscator {
   std::string recover(StringRef Path) const {
     return recoverer.remapPath(Path);
   }
+  void forEachPair(llvm::function_ref<void(StringRef, StringRef)> op) const {
+    for (auto pair: obfuscator.PathMappings) {
+      op(pair.first, pair.second);
+    }
+  }
 };
 
 } // end namespace swift
diff --git a/include/swift/Frontend/Frontend.h b/include/swift/Frontend/Frontend.h
@@ -174,6 +174,11 @@ class CompilerInvocation {
     SearchPathOpts.setImportSearchPaths(Paths);
   }
 
+  void setSerializedPathObfuscator(const PathObfuscator &obfuscator) {
+    FrontendOpts.serializedPathObfuscator = obfuscator;
+    SearchPathOpts.DeserializedPathRecoverer = obfuscator;
+  }
+
   ArrayRef<std::string> getImportSearchPaths() const {
     return SearchPathOpts.getImportSearchPaths();
   }
diff --git a/include/swift/PrintAsClang/PrintAsClang.h b/include/swift/PrintAsClang/PrintAsClang.h
@@ -1,4 +1,4 @@
-//===--- PrintAsObjC.h - Emit a header file for a Swift AST -----*- C++ -*-===//
+//===--- PrintAsClang.h - Emit a header file for a Swift AST ----*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_PRINTASOBJC_H
-#define SWIFT_PRINTASOBJC_H
+#ifndef SWIFT_PRINTASCLANG_H
+#define SWIFT_PRINTASCLANG_H
 
 #include "swift/Basic/LLVM.h"
 #include "swift/AST/AttrKind.h"
diff --git a/lib/AST/SwiftNameTranslation.cpp b/lib/AST/SwiftNameTranslation.cpp
@@ -64,7 +64,7 @@ getErrorDomainStringForObjC(const EnumDecl *ED) {
   for (const NominalTypeDecl * D = ED;
        D != nullptr;
        D = D->getDeclContext()->getSelfNominalTypeDecl()) {
-    // We don't currently PrintAsObjC any types whose parents are private or
+    // We don't currently PrintAsClang any types whose parents are private or
     // fileprivate.
     assert(D->getFormalAccess() >= AccessLevel::Internal &&
             "We don't currently append private discriminators");
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
@@ -2630,7 +2630,7 @@ getObjCObjectRepresentable(Type type, const DeclContext *dc) {
 ///
 /// This function determines when and how a particular type is mapped
 /// into a foreign language. Any changes to the logic here also need
-/// to be reflected in PrintAsObjC, so that the Swift type will be
+/// to be reflected in PrintAsClang, so that the Swift type will be
 /// properly printed for (Objective-)C and in SIL's bridging logic.
 static std::pair<ForeignRepresentableKind, ProtocolConformance *>
 getForeignRepresentable(Type type, ForeignLanguage language,
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -35,7 +35,7 @@ add_subdirectory(Markup)
 add_subdirectory(Migrator)
 add_subdirectory(Option)
 add_subdirectory(Parse)
-add_subdirectory(PrintAsObjC)
+add_subdirectory(PrintAsClang)
 add_subdirectory(RemoteAST)
 add_subdirectory(Sema)
 add_subdirectory(Serialization)
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -3093,7 +3093,7 @@ namespace {
         if (!result)
           return nullptr;
 
-        // HACK: Make sure PrintAsObjC always omits the 'enum' tag for
+        // HACK: Make sure PrintAsClang always omits the 'enum' tag for
         // option set enums.
         Impl.DeclsWithSuperfluousTypedefs.insert(decl);
         break;
diff --git a/lib/Frontend/ModuleInterfaceLoader.cpp b/lib/Frontend/ModuleInterfaceLoader.cpp
@@ -1341,6 +1341,15 @@ void InterfaceSubContextDelegateImpl::inheritOptionsForBuildingInterface(
     genericSubInvocation.getLangOptions().DisableAvailabilityChecking = true;
     GenericArgs.push_back("-disable-availability-checking");
   }
+
+  // Pass-down the obfuscators so we can get the serialized search paths properly.
+  genericSubInvocation.setSerializedPathObfuscator(
+    SearchPathOpts.DeserializedPathRecoverer);
+  SearchPathOpts.DeserializedPathRecoverer
+    .forEachPair([&](StringRef lhs, StringRef rhs) {
+      GenericArgs.push_back(ArgSaver.save(llvm::Twine("-serialized-path-obfuscate ")
+        + lhs + "=" + rhs).str());
+  });
 }
 
 bool InterfaceSubContextDelegateImpl::extractSwiftInterfaceVersionAndArgs(
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
@@ -21,7 +21,7 @@ target_link_libraries(swiftFrontendTool PRIVATE
     swiftIndex
     swiftIRGen
     swiftOption
-    swiftPrintAsObjC
+    swiftPrintAsClang
     swiftSerialization
     swiftSIL
     swiftSILGen
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -62,7 +62,7 @@
 #include "swift/Option/Options.h"
 #include "swift/Migrator/FixitFilter.h"
 #include "swift/Migrator/Migrator.h"
-#include "swift/PrintAsObjC/PrintAsObjC.h"
+#include "swift/PrintAsClang/PrintAsClang.h"
 #include "swift/Serialization/SerializationOptions.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -4873,6 +4873,11 @@ ParserResult<ImportDecl> Parser::parseDeclImport(ParseDeclOptions Flags,
                            /*diagnoseDollarPrefix=*/false,
                            diag::expected_identifier_in_decl, "import"))
       return nullptr;
+    if (Tok.is(tok::oper_postfix)) {
+        diagnose(Tok, diag::unexpected_operator_in_import_path)
+          .fixItRemove(Tok.getLoc());
+        return nullptr;
+    }
     HasNext = consumeIf(tok::period);
   } while (HasNext);
 
diff --git a/lib/PrintAsClang/CMakeLists.txt b/lib/PrintAsClang/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+add_swift_host_library(swiftPrintAsClang STATIC
+  DeclAndTypePrinter.cpp
+  ModuleContentsWriter.cpp
+  PrintAsClang.cpp)
+target_link_libraries(swiftPrintAsClang PRIVATE
+  swiftAST
+  swiftClangImporter
+  swiftFrontend
+  swiftIDE)
+
+set_swift_llvm_is_available(swiftPrintAsClang)
diff --git a/lib/PrintAsClang/DeclAndTypePrinter.cpp b/lib/PrintAsClang/DeclAndTypePrinter.cpp
diff --git a/lib/PrintAsClang/DeclAndTypePrinter.h b/lib/PrintAsClang/DeclAndTypePrinter.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_PRINTASOBJC_DECLANDTYPEPRINTER_H
-#define SWIFT_PRINTASOBJC_DECLANDTYPEPRINTER_H
+#ifndef SWIFT_PRINTASCLANG_DECLANDTYPEPRINTER_H
+#define SWIFT_PRINTASCLANG_DECLANDTYPEPRINTER_H
 
 #include "swift/AST/Type.h"
 // for OptionalTypeKind
diff --git a/lib/PrintAsClang/ModuleContentsWriter.cpp b/lib/PrintAsClang/ModuleContentsWriter.cpp
diff --git a/lib/PrintAsClang/ModuleContentsWriter.h b/lib/PrintAsClang/ModuleContentsWriter.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_PRINTASOBJC_MODULECONTENTSWRITER_H
-#define SWIFT_PRINTASOBJC_MODULECONTENTSWRITER_H
+#ifndef SWIFT_PRINTASCLANG_MODULECONTENTSWRITER_H
+#define SWIFT_PRINTASCLANG_MODULECONTENTSWRITER_H
 
 #include "swift/AST/AttrKind.h"
 #include "swift/Basic/LLVM.h"
diff --git a/lib/PrintAsClang/PrintAsClang.cpp b/lib/PrintAsClang/PrintAsClang.cpp
@@ -1,4 +1,4 @@
-//===--- PrintAsObjC.cpp - Emit a header file for a Swift AST -------------===//
+//===--- PrintAsClang.cpp - Emit a header file for a Swift AST ------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/PrintAsObjC/PrintAsObjC.h"
+#include "swift/PrintAsClang/PrintAsClang.h"
 
 #include "ModuleContentsWriter.h"
 
diff --git a/lib/PrintAsObjC/CMakeLists.txt b/lib/PrintAsObjC/CMakeLists.txt
diff --git a/lib/SILOptimizer/Mandatory/MoveKillsCopyableAddressesChecker.cpp b/lib/SILOptimizer/Mandatory/MoveKillsCopyableAddressesChecker.cpp
@@ -822,7 +822,8 @@ bool ClosureArgDataflowState::process(
     for (unsigned i : indices(livenessWorklist)) {
       if (auto *ptr = livenessWorklist[i]) {
         LLVM_DEBUG(llvm::dbgs()
-                   << "ClosureArgLivenessDataflow. Liveness User: " << *ptr);
+                   << "ClosureArgLivenessDataflow. Final: Liveness User: "
+                   << *ptr);
         state.pairedUseInsts.push_back(ptr);
       }
     }
@@ -1350,6 +1351,7 @@ bool GatherLexicalLifetimeUseVisitor::visitUse(Operand *op,
       auto *func = fas.getCalleeFunction();
       if (!func || !func->isDefer())
         return false;
+      LLVM_DEBUG(llvm::dbgs() << "Found closure use: " << *op->getUser());
       useState.insertClosureOperand(op);
       return true;
     }
@@ -1595,12 +1597,14 @@ bool DataflowState::process(
     bool emittedSingleDiagnostic = false;
 
     LLVM_DEBUG(llvm::dbgs() << "Checking Multi Block Dataflow for: " << *mvi);
+    LLVM_DEBUG(llvm::dbgs() << "    Parent Block: bb"
+                            << mvi->getParent()->getDebugID() << "\n");
 
     BasicBlockWorklist worklist(fn);
     BasicBlockSetVector visitedBlocks(fn);
     for (auto *succBlock : mvi->getParent()->getSuccessorBlocks()) {
       LLVM_DEBUG(llvm::dbgs()
-                 << "    SuccBlocks: " << succBlock->getDebugID() << "\n");
+                 << "    SuccBlocks: bb" << succBlock->getDebugID() << "\n");
       worklist.pushIfNotVisited(succBlock);
       visitedBlocks.insert(succBlock);
     }
@@ -1644,7 +1648,8 @@ bool DataflowState::process(
       {
         auto iter = closureUseBlocks.find(next);
         if (iter != closureUseBlocks.end()) {
-          LLVM_DEBUG(llvm::dbgs() << "    Is Use Block! Emitting Error!\n");
+          LLVM_DEBUG(llvm::dbgs()
+                     << "    Is Use Block From Closure! Emitting Error!\n");
           // We found one! Emit the diagnostic and continue and see if we can
           // get more diagnostics.
           auto &astContext = fn->getASTContext();
@@ -1825,7 +1830,7 @@ void DataflowState::init() {
     }
   }
 
-  for (auto closureUse : useState.closureUses) {
+  for (auto &closureUse : useState.closureUses) {
     auto *use = closureUse.first;
     auto &state = closureUse.second;
     auto *user = use->getUser();
diff --git a/lib/Sema/DerivedConformanceError.cpp b/lib/Sema/DerivedConformanceError.cpp
@@ -119,7 +119,7 @@ ValueDecl *DerivedConformance::deriveBridgedNSError(ValueDecl *requirement) {
 
     auto scope = Nominal->getFormalAccessScope(Nominal->getModuleScopeContext());
     if (scope.isPublic() || scope.isInternal())
-      // PrintAsObjC may print this domain, so we should make sure we use the
+      // PrintAsClang may print this domain, so we should make sure we use the
       // same string it will.
       synthesizer = deriveBodyBridgedNSError_printAsObjCEnum_nsErrorDomain;
 
diff --git a/lib/Sema/TypeCheckDeclObjC.cpp b/lib/Sema/TypeCheckDeclObjC.cpp
@@ -299,7 +299,7 @@ static void diagnoseFunctionParamNotRepresentable(
 static bool isParamListRepresentableInObjC(const AbstractFunctionDecl *AFD,
                                            const ParameterList *PL,
                                            ObjCReason Reason) {
-  // If you change this function, you must add or modify a test in PrintAsObjC.
+  // If you change this function, you must add or modify a test in PrintAsClang.
   ASTContext &ctx = AFD->getASTContext();
   auto &diags = ctx.Diags;
   auto behavior = behaviorLimitForObjCReason(Reason, ctx);
@@ -598,7 +598,7 @@ bool swift::isRepresentableInObjC(
   asyncConvention = None;
   errorConvention = None;
 
-  // If you change this function, you must add or modify a test in PrintAsObjC.
+  // If you change this function, you must add or modify a test in PrintAsClang.
   ASTContext &ctx = AFD->getASTContext();
   DiagnosticStateRAII diagState(ctx.Diags);
 
@@ -1025,7 +1025,7 @@ bool swift::isRepresentableInObjC(
 }
 
 bool swift::isRepresentableInObjC(const VarDecl *VD, ObjCReason Reason) {
-  // If you change this function, you must add or modify a test in PrintAsObjC.
+  // If you change this function, you must add or modify a test in PrintAsClang.
   
   if (VD->isInvalid())
     return false;
@@ -1085,7 +1085,7 @@ bool swift::isRepresentableInObjC(const VarDecl *VD, ObjCReason Reason) {
 }
 
 bool swift::isRepresentableInObjC(const SubscriptDecl *SD, ObjCReason Reason) {
-  // If you change this function, you must add or modify a test in PrintAsObjC.
+  // If you change this function, you must add or modify a test in PrintAsClang.
   ASTContext &ctx = SD->getASTContext();
   DiagnosticStateRAII diagState(ctx.Diags);
   auto behavior = behaviorLimitForObjCReason(Reason, ctx);
diff --git a/test/Driver/vfs.swift b/test/Driver/vfs.swift
@@ -11,3 +11,13 @@
 // Verifies that input paths are not rejected prematurely when -vfsoverlay is present as they may exist on the vfs (which the frontend accounts for) even if they don't exist on the real file system.
 // RUN: not %swiftc_driver -driver-print-jobs -c %t/file-not-on-the-real-filesystem.swift
 // RUN: %swiftc_driver -driver-print-jobs -c -vfsoverlay overlay1.yaml %t/file-not-on-the-real-filesystem.swift
+
+// RUN: mkdir -p %t
+// RUN: cd %t
+// RUN: echo "foobar" > main.swift
+// RUN: not %swiftc_driver main.swift 2>&1 | %FileCheck --check-prefix=CHECK-ERROR %s
+// RUN: echo '{"roots": [],"version": 0}' > %t.yaml
+// RUN: not %swiftc_driver -vfsoverlay %t.yaml main.swift 2>&1 | %FileCheck --check-prefix=CHECK-ERROR %s
+// RUN: echo '{"version": 0,"roots":[{"type":"directory","name":"%/t","contents":[{"type":"file","name":"vfsname.swift", "external-contents":"main.swift"}]}]}' > %t.yaml
+// RUN: not %swiftc_driver -vfsoverlay %t.yaml vfsname.swift -v 2>&1 | %FileCheck --check-prefix=CHECK-ERROR %s
+// CHECK-ERROR: {{^}}main.swift:1:1: error:
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-1argument-metatype-run.swift b/test/IRGen/prespecialized-metadata/class-inmodule-1argument-metatype-run.swift
@@ -11,6 +11,8 @@
 // UNSUPPORTED: CPU=x86_64 && OS=watchos
 // UNSUPPORTED: CPU=i386 && OS=watchos
 // UNSUPPORTED: use_os_stdlib
+// rdar://87772056
+// UNSUPPORTED: CPU=arm64e && OS=ios
 
 class MyGenericClazz<T> {
 }
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift b/test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift b/test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift
diff --git a/test/ModuleInterface/obfuscator.swift b/test/ModuleInterface/obfuscator.swift
diff --git a/test/Runtime/linux-fatal-backtrace.swift b/test/Runtime/linux-fatal-backtrace.swift
diff --git a/test/SILOptimizer/move_function_kills_copyable_addressonly_vars.swift b/test/SILOptimizer/move_function_kills_copyable_addressonly_vars.swift
diff --git a/test/SILOptimizer/move_function_kills_copyable_loadable_vars.swift b/test/SILOptimizer/move_function_kills_copyable_loadable_vars.swift
diff --git a/test/decl/import/import.swift b/test/decl/import/import.swift

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,11 @@ class CompilerInvocation {`
`174`	`174`	`SearchPathOpts.setImportSearchPaths(Paths);`
`175`	`175`	`}`
`176`	`176`
	`177`	`+ void setSerializedPathObfuscator(const PathObfuscator &obfuscator) {`
	`178`	`+ FrontendOpts.serializedPathObfuscator = obfuscator;`
	`179`	`+ SearchPathOpts.DeserializedPathRecoverer = obfuscator;`
	`180`	`+ }`
	`181`	`+`
`177`	`182`	`ArrayRef<std::string> getImportSearchPaths() const {`
`178`	`183`	`return SearchPathOpts.getImportSearchPaths();`
`179`	`184`	`}`