---

yaml
---
r: 341375
b: refs/heads/rxwei-patch-1
c: d45dc38
h: refs/heads/master
i:
  341373: 4bc90cd
  341371: e667e66
  341367: 9a698b7
  341359: 221a2d7
  341343: 737adad
  341311: fdc2545
  341247: 0ae5c1c

Author: mundaym

[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: ce3aff12da2821314b6555c6ff98de4abeaa5cdc
+refs/heads/rxwei-patch-1: d45dc382083b36edf6b515d5a2bc24a61781427b
 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/AnyFunctionRef.h

@@ -76,6 +76,18 @@ class AnyFunctionRef {
     return !TheFunction.get<AbstractClosureExpr *>()->getType().isNull();
   }
 
+  bool hasSingleExpressionBody() const {
+    if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
+      return AFD->hasSingleExpressionBody();
+    return TheFunction.get<AbstractClosureExpr *>()->hasSingleExpressionBody();
+  }
+
+  Expr *getSingleExpressionBody() const {
+    if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
+      return AFD->getSingleExpressionBody();
+    return TheFunction.get<AbstractClosureExpr *>()->getSingleExpressionBody();
+  }
+
   Type getType() const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
       return AFD->getInterfaceType();

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

@@ -3475,6 +3475,12 @@ class AbstractClosureExpr : public DeclContext, public Expr {
   /// Whether this closure consists of a single expression.
   bool hasSingleExpressionBody() const;
 
+  /// Retrieve the body for closure that has a single expression for
+  /// its body.
+  ///
+  /// Only valid when \c hasSingleExpressionBody() is true.
+  Expr *getSingleExpressionBody() const;
+
   static bool classof(const Expr *E) {
     return E->getKind() >= ExprKind::First_AbstractClosureExpr &&
            E->getKind() <= ExprKind::Last_AbstractClosureExpr;

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

@@ -13,6 +13,8 @@
 #ifndef SWIFT_AST_RESILIENCE_EXPANSION_H
 #define SWIFT_AST_RESILIENCE_EXPANSION_H
 
+#include "llvm/Support/raw_ostream.h"
+
 namespace swift {
 
 /// A specification for how much to expand resilient types.
@@ -44,6 +46,16 @@ enum class ResilienceExpansion : unsigned {
   Last_ResilienceExpansion = Maximal
 };
 
+inline llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
+                                     ResilienceExpansion expansion) {
+  switch (expansion) {
+  case ResilienceExpansion::Minimal:
+    return os << "Minimal";
+  case ResilienceExpansion::Maximal:
+    return os << "Maximal";
+  }
+}
+
 } // namespace swift
 
 #endif // LLVM_SWIFT_AST_CAPTURE_INFO_H

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

@@ -64,8 +64,9 @@ class SearchPathOptions {
   /// Path to search for compiler-relative header files.
   std::string RuntimeResourcePath;
 
-  /// Path to search for compiler-relative stdlib dylibs.
-  std::string RuntimeLibraryPath;
+  /// Paths to search for compiler-relative stdlib dylibs, in order of
+  /// preference.
+  std::vector<std::string> RuntimeLibraryPaths;
 
   /// Paths to search for stdlib modules. One of these will be compiler-relative.
   std::vector<std::string> RuntimeLibraryImportPaths;

branches/rxwei-patch-1/include/swift/Basic/SourceManager.h

@@ -103,6 +103,13 @@ class SourceManager {
            rangeContainsTokenLoc(Enclosing, Inner.End);
   }
 
+  /// Returns true if range \p R contains the code-completion location, if any.
+  bool rangeContainsCodeCompletionLoc(SourceRange R) const {
+    return CodeCompletionBufferID
+               ? rangeContainsTokenLoc(R, getCodeCompletionLoc())
+               : false;
+  }
+
   /// Returns the buffer ID for the specified *valid* location.
   ///
   /// Because a valid source location always corresponds to a source buffer,

branches/rxwei-patch-1/include/swift/SIL/TypeLowering.h

@@ -250,6 +250,12 @@ class TypeLowering {
 
   virtual ~TypeLowering() {}
 
+  /// Print out the internal state of this type lowering into \p os.
+  void print(llvm::raw_ostream &os) const;
+
+  /// Dump out the internal state of this type lowering to llvm::dbgs().
+  LLVM_ATTRIBUTE_DEPRECATED(void dump() const, "Only for use in the debugger");
+
   /// Are r-values of this type passed as arguments indirectly by formal
   /// convention?
   ///

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

@@ -1918,6 +1918,15 @@ bool AbstractClosureExpr::hasSingleExpressionBody() const {
   return true;
 }
 
+Expr *AbstractClosureExpr::getSingleExpressionBody() const {
+  if (auto closure = dyn_cast<ClosureExpr>(this))
+    return closure->getSingleExpressionBody();
+  else if (auto autoclosure = dyn_cast<AutoClosureExpr>(this))
+    return autoclosure->getSingleExpressionBody();
+
+  return nullptr;
+}
+
 #define FORWARD_SOURCE_LOCS_TO(CLASS, NODE) \
   SourceRange CLASS::getSourceRange() const {     \
     return (NODE)->getSourceRange();              \

branches/rxwei-patch-1/lib/Frontend/CompilerInvocation.cpp

@@ -30,6 +30,9 @@
 using namespace swift;
 using namespace llvm::opt;
 
+/// The path for Swift libraries in the OS on Darwin.
+#define DARWIN_OS_LIBRARY_PATH "/usr/lib/swift"
+
 swift::CompilerInvocation::CompilerInvocation() {
   setTargetTriple(llvm::sys::getDefaultTargetTriple());
 }
@@ -66,7 +69,10 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts,
   llvm::SmallString<128> LibPath(SearchPathOpts.RuntimeResourcePath);
 
   llvm::sys::path::append(LibPath, getPlatformNameForTriple(Triple));
-  SearchPathOpts.RuntimeLibraryPath = LibPath.str();
+  SearchPathOpts.RuntimeLibraryPaths.clear();
+  SearchPathOpts.RuntimeLibraryPaths.push_back(LibPath.str());
+  if (Triple.isOSDarwin())
+    SearchPathOpts.RuntimeLibraryPaths.push_back(DARWIN_OS_LIBRARY_PATH);
 
   // Set up the import paths containing the swiftmodules for the libraries in
   // RuntimeLibraryPath.

branches/rxwei-patch-1/lib/Frontend/ParseableInterfaceModuleLoader.cpp

@@ -1066,7 +1066,7 @@ class ParseableInterfaceModuleLoaderImpl {
   }
 
   bool isInResourceDir(StringRef path) {
-    StringRef resourceDir = ctx.SearchPathOpts.RuntimeLibraryPath;
+    StringRef resourceDir = ctx.SearchPathOpts.RuntimeResourcePath;
     if (resourceDir.empty()) return false;
     return path.startswith(resourceDir);
   }

branches/rxwei-patch-1/lib/IRGen/GenType.cpp

@@ -1227,7 +1227,23 @@ TypeConverter::TypeConverter(IRGenModule &IGM)
     if (!doesPlatformUseLegacyLayouts(platformName, archName))
       return;
 
-    defaultPath.append(IGM.Context.SearchPathOpts.RuntimeLibraryPath);
+    // Find the first runtime library path that exists.
+    bool found = false;
+    for (auto &RuntimeLibraryPath
+         : IGM.Context.SearchPathOpts.RuntimeLibraryPaths) {
+      if (llvm::sys::fs::exists(RuntimeLibraryPath)) {
+        defaultPath.append(RuntimeLibraryPath);
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      auto joined = llvm::join(IGM.Context.SearchPathOpts.RuntimeLibraryPaths,
+                               "', '");
+      llvm::report_fatal_error("Unable to find a runtime library path at '"
+                               + joined + "'");
+    }
+
     llvm::sys::path::append(defaultPath, "layouts-");
     defaultPath.append(archName);
     defaultPath.append(".yaml");

branches/rxwei-patch-1/lib/Immediate/Immediate.cpp

@@ -59,15 +59,26 @@ static void *loadRuntimeLib(StringRef runtimeLibPathWithName) {
 #endif
 }
 
-static void *loadRuntimeLib(StringRef sharedLibName, StringRef runtimeLibPath) {
+static void *loadRuntimeLibAtPath(StringRef sharedLibName,
+                                  StringRef runtimeLibPath) {
   // FIXME: Need error-checking.
   llvm::SmallString<128> Path = runtimeLibPath;
   llvm::sys::path::append(Path, sharedLibName);
   return loadRuntimeLib(Path);
 }
 
-void *swift::immediate::loadSwiftRuntime(StringRef runtimeLibPath) {
-  return loadRuntimeLib("libswiftCore" LTDL_SHLIB_EXT, runtimeLibPath);
+static void *loadRuntimeLib(StringRef sharedLibName,
+                            ArrayRef<std::string> runtimeLibPaths) {
+  for (auto &runtimeLibPath : runtimeLibPaths) {
+    if (void *handle = loadRuntimeLibAtPath(sharedLibName, runtimeLibPath))
+      return handle;
+  }
+  return nullptr;
+}
+
+void *swift::immediate::loadSwiftRuntime(ArrayRef<std::string>
+                                         runtimeLibPaths) {
+  return loadRuntimeLib("libswiftCore" LTDL_SHLIB_EXT, runtimeLibPaths);
 }
 
 static bool tryLoadLibrary(LinkLibrary linkLib,
@@ -105,9 +116,9 @@ static bool tryLoadLibrary(LinkLibrary linkLib,
     if (!success)
       success = loadRuntimeLib(stem);
 
-    // If that fails, try our runtime library path.
+    // If that fails, try our runtime library paths.
     if (!success)
-      success = loadRuntimeLib(stem, searchPathOpts.RuntimeLibraryPath);
+      success = loadRuntimeLib(stem, searchPathOpts.RuntimeLibraryPaths);
     break;
   }
   case LibraryKind::Framework: {
@@ -240,7 +251,7 @@ int swift::RunImmediately(CompilerInstance &CI, const ProcessCmdLine &CmdLine,
   //
   // This must be done here, before any library loading has been done, to avoid
   // racing with the static initializers in user code.
-  auto stdlib = loadSwiftRuntime(Context.SearchPathOpts.RuntimeLibraryPath);
+  auto stdlib = loadSwiftRuntime(Context.SearchPathOpts.RuntimeLibraryPaths);
   if (!stdlib) {
     CI.getDiags().diagnose(SourceLoc(),
                            diag::error_immediate_mode_missing_stdlib);

branches/rxwei-patch-1/lib/Immediate/ImmediateImpl.h

@@ -37,8 +37,8 @@ namespace immediate {
 /// Returns a handle to the runtime suitable for other \c dlsym or \c dlclose
 /// calls or \c null if an error occurred.
 ///
-/// \param runtimeLibPath Path to search for compiler-relative stdlib dylibs.
-void *loadSwiftRuntime(StringRef runtimeLibPath);
+/// \param runtimeLibPaths Paths to search for stdlib dylibs.
+void *loadSwiftRuntime(ArrayRef<std::string> runtimeLibPaths);
 bool tryLoadLibraries(ArrayRef<LinkLibrary> LinkLibraries,
                       SearchPathOptions SearchPathOpts,
                       DiagnosticEngine &Diags);

branches/rxwei-patch-1/lib/Immediate/REPL.cpp

@@ -969,7 +969,7 @@ class REPLEnvironment {
     ASTContext &Ctx = CI.getASTContext();
     Ctx.LangOpts.EnableAccessControl = false;
     if (!ParseStdlib) {
-      if (!loadSwiftRuntime(Ctx.SearchPathOpts.RuntimeLibraryPath)) {
+      if (!loadSwiftRuntime(Ctx.SearchPathOpts.RuntimeLibraryPaths)) {
         CI.getDiags().diagnose(SourceLoc(),
                                diag::error_immediate_mode_missing_stdlib);
         return;

branches/rxwei-patch-1/lib/SIL/TypeLowering.cpp

@@ -2687,3 +2687,22 @@ unsigned TypeConverter::countNumberOfFields(SILType Ty,
   TypeFields[key] = fieldsCount;
   return std::max(fieldsCount, 1U);
 }
+
+void TypeLowering::print(llvm::raw_ostream &os) const {
+  auto BOOL = [&](bool b) -> StringRef {
+    if (b)
+      return "true";
+    return "false";
+  };
+  os << "Type Lowering for lowered type: " << LoweredType << ".\n"
+     << "Expansion: " << ResilienceExpansion(ForExpansion) << "\n"
+     << "isTrivial: " << BOOL(Properties.isTrivial()) << ".\n"
+     << "isFixedABI: " << BOOL(Properties.isFixedABI()) << ".\n"
+     << "isAddressOnly: " << BOOL(Properties.isAddressOnly()) << ".\n"
+     << "isResilient: " << BOOL(Properties.isResilient()) << ".\n"
+     << "\n";
+}
+
+void TypeLowering::dump() const {
+  print(llvm::dbgs());
+}

branches/rxwei-patch-1/lib/Sema/BuilderTransform.cpp

@@ -496,6 +496,12 @@ bool TypeChecker::typeCheckFunctionBuilderFuncBody(FuncDecl *FD,
       options |= TypeCheckExprFlags::ConvertTypeIsOpaqueReturnType;
   }
 
+  // If we are performing code-completion inside the functions body, supress
+  // diagnostics to workaround typechecking performance problems.
+  if (Context.SourceMgr.rangeContainsCodeCompletionLoc(
+          FD->getBody()->getSourceRange()))
+    options |= TypeCheckExprFlags::SuppressDiagnostics;
+
   // Type-check the single result expression.
   Type returnExprType = typeCheckExpression(returnExpr, FD,
                                             TypeLoc::withoutLoc(returnType),
@@ -574,6 +580,12 @@ ConstraintSystem::TypeMatchResult ConstraintSystem::applyFunctionBuilder(
     assert(!builderType->hasTypeParameter());
   }
 
+  // If we are performing code-completion inside the closure body, supress
+  // diagnostics to workaround typechecking performance problems.
+  if (getASTContext().SourceMgr.rangeContainsCodeCompletionLoc(
+          closure->getSourceRange()))
+    Options |= ConstraintSystemFlags::SuppressDiagnostics;
+
   BuilderClosureVisitor visitor(getASTContext(), this,
                                 /*wantExpr=*/true, builderType);
   Expr *singleExpr = visitor.visit(closure->getBody());

branches/rxwei-patch-1/lib/Sema/TypeCheckStmt.cpp

@@ -443,6 +443,29 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
       return RS;
     }
 
+    // If the body consisted of a single return without a result
+    // 
+    //   func foo() -> Int {
+    //     return
+    //   }
+    // 
+    // in parseAbstractFunctionBody the return is given an empty, implicit tuple
+    // as its result
+    //
+    //   func foo() -> Int {
+    //     return ()
+    //   }
+    //
+    // Look for that case and diagnose it as missing return expression.
+    if (!ResultTy->isVoid() && TheFunc->hasSingleExpressionBody()) {
+      auto expr = TheFunc->getSingleExpressionBody();
+      if (expr->isImplicit() && isa<TupleExpr>(expr) &&
+          cast<TupleExpr>(expr)->getNumElements() == 0) {
+        TC.diagnose(RS->getReturnLoc(), diag::return_expr_missing);
+        return RS;
+      }
+    }
+
     Expr *E = RS->getResult();
 
     // In an initializer, the only expression allowed is "nil", which indicates

branches/rxwei-patch-1/test/Parse/omit_return_fail.swift

@@ -3,3 +3,7 @@
 func badIs<T>(_ value: Any, anInstanceOf type: T.Type) -> Bool {
     value is type // expected-error {{use of undeclared type 'type'}}
 }
+
+func foo() -> Int {
+    return // expected-error {{non-void function should return a value}}
+}

branches/rxwei-patch-1/test/stdlib/ObjCEvilClassInitialization.swift

@@ -14,12 +14,14 @@ import StdlibUnittest
 let tests = TestSuite("ObjCEvilClassInitialization")
 
 tests.test("GenericOnEvilClass") {
-  struct Generic<T> {
-    var type: T.Type { return T.self }
+  if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
+    struct Generic<T> {
+      var type: T.Type { return T.self }
+    }
+    let g = Generic<EvilClass>()
+    expectEqual("\(type(of: g))", "Generic<EvilClass>")
+    expectEqual(g.type, EvilClass.self)
   }
-  let g = Generic<EvilClass>()
-  expectEqual("\(type(of: g))", "Generic<EvilClass>")
-  expectEqual(g.type, EvilClass.self)
 }
 
 runAllTests()

branches/rxwei-patch-1/test/stdlib/UIViewControllerAdditions.swift

@@ -1,6 +1,6 @@
 // RxUN: %target-build-swift -g %s -o %t/ViewControllerAdditions.out
-// RxUN: %target-run %t/ViewControllerAdditions.out %S/Inputs/UIViewControllerAdditions | %FileCheck %s
-// RUN: %target-run-simple-swift %S/Inputs/UIViewControllerAdditions | %FileCheck %s
+// RxUN: %target-run %t/ViewControllerAdditions.out %S/Inputs/UIViewControllerAdditions/* | %FileCheck %s
+// RUN: %target-run-simple-swift %S/Inputs/UIViewControllerAdditions/* | %FileCheck %s
 // REQUIRES: executable_test
 
 // REQUIRES: OS=ios
@@ -28,7 +28,9 @@ class View6Controller : UIViewController { }
 // no nib
 class MissingViewController : UIViewController { }
 
-let bundle = Bundle(path: CommandLine.arguments[1])
+let nsarg1 = CommandLine.arguments[1] as NSString
+let bundlePath = nsarg1.deletingLastPathComponent
+let bundle = Bundle(path: bundlePath)
 
 let v1 = View1Controller(nibName:nil, bundle:bundle)
 print("tag 1 0=\(v1.view.tag) you're it")

branches/rxwei-patch-1/utils/gyb_syntax_support/Token.py

@@ -314,7 +314,7 @@ def macro_name(self):
             classification='StringLiteral', serialization_code=113),
 
     Misc('Unknown', 'unknown', serialization_code=115),
-    Misc('Identifier', 'identifier', classification=None,
+    Misc('Identifier', 'identifier', classification='Identifier',
          serialization_code=105),
     Misc('UnspacedBinaryOperator', 'oper_binary_unspaced',
          serialization_code=107),