Merge pull request #3864 from swiftwasm/main

Author: MaxDesiatov

include/swift-c/DependencyScan/DependencyScan.h

@@ -300,13 +300,17 @@ swiftscan_batch_scan_result_dispose(swiftscan_batch_scan_result_t *result);
 SWIFTSCAN_PUBLIC void
 swiftscan_scan_invocation_dispose(swiftscan_scan_invocation_t invocation);
 
-//=== Feature-Query Functions -----------------------------------------===//
+//=== Feature-Query Functions ---------------------------------------------===//
 SWIFTSCAN_PUBLIC swiftscan_string_set_t *
 swiftscan_compiler_supported_arguments_query();
 
 SWIFTSCAN_PUBLIC swiftscan_string_set_t *
 swiftscan_compiler_supported_features_query();
 
+//=== Target-Info Functions -----------------------------------------------===//
+SWIFTSCAN_PUBLIC swiftscan_string_ref_t
+swiftscan_compiler_target_info_query(swiftscan_scan_invocation_t invocation);
+
 //=== Scanner Functions ---------------------------------------------------===//
 
 /// Container of the configuration state and shared cache for dependency

include/swift/Basic/TargetInfo.h

@@ -0,0 +1,40 @@
+//===--- TargetInfo.h - Target Info Output ---------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides a high-level API for emitting target info
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_TARGETINFO_H
+#define SWIFT_TARGETINFO_H
+
+#include "swift/Basic/LLVM.h"
+
+namespace llvm {
+class Triple;
+class VersionTuple;
+}
+
+namespace swift {
+class CompilerInvocation;
+
+namespace targetinfo {
+void printTargetInfo(const CompilerInvocation &invocation,
+                     llvm::raw_ostream &out);
+
+void printTripleInfo(const llvm::Triple &triple,
+                     llvm::Optional<llvm::VersionTuple> runtimeVersion,
+                     llvm::raw_ostream &out);
+} // namespace targetinfo
+} // namespace swift
+
+#endif

include/swift/DependencyScan/DependencyScanningTool.h

@@ -24,6 +24,10 @@
 namespace swift {
 namespace dependencies {
 
+/// Given a set of arguments to a print-target-info frontend tool query, produce the
+/// JSON target info.
+llvm::ErrorOr<swiftscan_string_ref_t> getTargetInfo(ArrayRef<const char *> Command);
+
 /// The high-level implementation of the dependency scanner that runs on
 /// an individual worker thread.
 class DependencyScanningTool {

include/swift/SIL/SILInstruction.h

@@ -1949,6 +1949,10 @@ class AllocStackInst final
   /// Whether the alloc_stack instruction corresponds to a source-level VarDecl.
   bool isLexical() const { return lexical; }
 
+  /// If this is a lexical borrow, eliminate the lexical bit. If this borrow
+  /// doesn't have a lexical bit, do not do anything.
+  void removeIsLexical() { lexical = false; }
+
   /// Return the debug variable information attached to this instruction.
   Optional<SILDebugVariable> getVarInfo() const {
     Optional<SILType> AuxVarType;
@@ -4033,6 +4037,10 @@ class BeginBorrowInst
   /// source-level lexical scope.
   bool isLexical() const { return lexical; }
 
+  /// If this is a lexical borrow, eliminate the lexical bit. If this borrow
+  /// doesn't have a lexical bit, do not do anything.
+  void removeIsLexical() { lexical = false; }
+
   /// Return a range over all EndBorrow instructions for this BeginBorrow.
   EndBorrowRange getEndBorrows() const;
 

include/swift/SILOptimizer/PassManager/Passes.def

@@ -425,6 +425,8 @@ PASS(MoveOnlyChecker, "sil-move-only-checker",
 PASS(MoveKillsCopyableValuesChecker, "sil-move-kills-copyable-values-checker",
      "Pass that checks that any copyable (non-move only) value that is passed "
      "to _move do not have any uses later than the _move")
+PASS(LexicalLifetimeEliminator, "sil-lexical-lifetime-eliminator",
+     "Pass that removes lexical lifetime markers from borrows and alloc stack")
 PASS(PruneVTables, "prune-vtables",
      "Mark class methods that do not require vtable dispatch")
 PASS_RANGE(AllPasses, AADumper, PruneVTables)

lib/AST/ASTPrinter.cpp

@@ -3414,9 +3414,6 @@ void PrintAST::printOneParameter(const ParamDecl *param,
 
   printAttributes(param);
 
-  if (param->isIsolated())
-    Printer << "isolated ";
-
   printArgName();
 
   TypeLoc TheTypeLoc;

lib/AST/CMakeLists.txt

@@ -80,6 +80,7 @@ add_swift_host_library(swiftAST STATIC
   RequirementMachine/KnuthBendix.cpp
   RequirementMachine/PropertyMap.cpp
   RequirementMachine/PropertyUnification.cpp
+  RequirementMachine/RequirementLowering.cpp
   RequirementMachine/RequirementMachine.cpp
   RequirementMachine/RequirementMachineRequests.cpp
   RequirementMachine/RewriteContext.cpp

lib/AST/NameLookup.cpp

@@ -1456,10 +1456,25 @@ DirectLookupRequest::evaluate(Evaluator &evaluator,
       auto allFound = evaluateOrDefault(
           ctx.evaluator, CXXNamespaceMemberLookup({cast<EnumDecl>(decl), name}),
           {});
-      for (auto found : allFound)
-        Table.addMember(found);
-
       populateLookupTableEntryFromExtensions(ctx, Table, baseName, decl);
+
+      // Bypass the regular member lookup table if we find something in
+      // the original C++ namespace. We don't want to store the C++ decl in the
+      // lookup table as the decl can be referenced  from multiple namespace
+      // declarations due to inline namespaces. We still merge in the other
+      // entries found in the lookup table, to support finding members in
+      // namespace extensions.
+      if (!allFound.empty()) {
+        auto known = Table.find(name);
+        if (known != Table.end()) {
+          auto swiftLookupResult = maybeFilterOutAttrImplements(
+              known->second, name, includeAttrImplements);
+          for (auto foundSwiftDecl : swiftLookupResult) {
+            allFound.push_back(foundSwiftDecl);
+          }
+        }
+        return allFound;
+      }
     } else if (isa_and_nonnull<clang::RecordDecl>(decl->getClangDecl())) {
       auto allFound = evaluateOrDefault(
           ctx.evaluator,