---

yaml
---
r: 341374
b: refs/heads/rxwei-patch-1
c: ce3aff1
h: refs/heads/master

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: 5cf7ce7ab4c22069bb63179ee349a05cb4e4caad
+refs/heads/rxwei-patch-1: ce3aff12da2821314b6555c6ff98de4abeaa5cdc
 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,18 +76,6 @@ 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,12 +3475,6 @@ 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,8 +13,6 @@
 #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.
@@ -46,16 +44,6 @@ 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,9 +64,8 @@ class SearchPathOptions {
   /// Path to search for compiler-relative header files.
   std::string RuntimeResourcePath;
 
-  /// Paths to search for compiler-relative stdlib dylibs, in order of
-  /// preference.
-  std::vector<std::string> RuntimeLibraryPaths;
+  /// Path to search for compiler-relative stdlib dylibs.
+  std::string RuntimeLibraryPath;
 
   /// 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/ByteTreeSerialization.h

@@ -155,7 +155,7 @@ class ByteTreeWriter {
   llvm::BinaryStreamWriter &StreamWriter;
 
   /// The underlying stream of the StreamWriter. We need this reference so that
-  /// we can call \c ExponentialGrowthAppendingBinaryByteStream.writeRaw
+  /// we can call \c ExponentialGrowthAppendingBinaryByteStream.writeInteger
   /// which is more efficient than the generic \c writeBytes of
   /// \c llvm::BinaryStreamWriter since it avoids the arbitrary size memcopy.
   ExponentialGrowthAppendingBinaryByteStream &Stream;
@@ -179,13 +179,10 @@ class ByteTreeWriter {
                  llvm::BinaryStreamWriter &StreamWriter, UserInfoMap &UserInfo)
       : StreamWriter(StreamWriter), Stream(Stream), UserInfo(UserInfo) {}
 
-  /// Write the given value to the ByteTree in the same form in which it is
-  /// represented on the serializing machine.
+  /// Write the given value to the ByteTree in little-endian byte order.
   template <typename T>
-  llvm::Error writeRaw(T Value) {
-    // FIXME: We implicitly inherit the endianess of the serializing machine.
-    // Since we're currently only supporting macOS that's not a problem for now.
-    auto Error = Stream.writeRaw(StreamWriter.getOffset(), Value);
+  llvm::Error writeInteger(T Value) {
+    auto Error = Stream.writeInteger(StreamWriter.getOffset(), Value);
     StreamWriter.setOffset(StreamWriter.getOffset() + sizeof(T));
     return Error;
   }
@@ -205,7 +202,7 @@ class ByteTreeWriter {
     // Set the most significant bit to indicate that the next construct is an
     // object and not a scalar.
     uint32_t ToWrite = NumFields | (1 << 31);
-    auto Error = writeRaw(ToWrite);
+    auto Error = writeInteger(ToWrite);
     (void)Error;
     assert(!Error);
 
@@ -241,7 +238,7 @@ class ByteTreeWriter {
     llvm::BinaryStreamWriter StreamWriter(Stream);
     ByteTreeWriter Writer(Stream, StreamWriter, UserInfo);
 
-    auto Error = Writer.writeRaw(ProtocolVersion);
+    auto Error = Writer.writeInteger(ProtocolVersion);
     (void)Error;
     assert(!Error);
 
@@ -272,7 +269,7 @@ class ByteTreeWriter {
     // bitflag that indicates if the next construct in the tree is an object
     // or a scalar.
     assert((ValueSize & ((uint32_t)1 << 31)) == 0 && "Value size too large");
-    auto SizeError = writeRaw(ValueSize);
+    auto SizeError = writeInteger(ValueSize);
     (void)SizeError;
     assert(!SizeError);
 
@@ -292,11 +289,11 @@ class ByteTreeWriter {
     validateAndIncreaseFieldIndex(Index);
 
     uint32_t ValueSize = sizeof(T);
-    auto SizeError = writeRaw(ValueSize);
+    auto SizeError = writeInteger(ValueSize);
     (void)SizeError;
     assert(!SizeError);
 
-    auto ContentError = writeRaw(Value);
+    auto ContentError = writeInteger(Value);
     (void)ContentError;
     assert(!ContentError);
   }

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

@@ -33,13 +33,10 @@ class ExponentialGrowthAppendingBinaryByteStream
   /// The buffer holding the data.
   SmallVector<uint8_t, 0> Data;
 
-  llvm::support::endianness Endian;
+  /// Data in the stream is always encoded in little-endian byte order.
+  const llvm::support::endianness Endian = llvm::support::endianness::little;
 public:
-  ExponentialGrowthAppendingBinaryByteStream()
-      : ExponentialGrowthAppendingBinaryByteStream(
-            llvm::support::endianness::little) {}
-  ExponentialGrowthAppendingBinaryByteStream(llvm::support::endianness Endian)
-      : Endian(Endian) {}
+  ExponentialGrowthAppendingBinaryByteStream() = default;
 
   void reserve(size_t Size);
 
@@ -57,16 +54,11 @@ class ExponentialGrowthAppendingBinaryByteStream
 
   llvm::Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> Buffer) override;
 
-  /// This is an optimized version of \c writeBytes that assumes we know the
-  /// size of \p Value at compile time (which in particular holds for integers).
-  /// It does so by exposing the memcpy to the optimizer along with the size 
-  /// of the value being assigned; the compiler can then optimize the memcpy
-  /// into a fixed set of instructions.
-  /// This assumes that the endianess of this steam is the same as the native
-  /// endianess on the executing machine. No endianess transformations are
-  /// performed.
+  /// This is an optimized version of \c writeBytes specifically for integers.
+  /// Integers are written in little-endian byte order.
   template<typename T>
-  llvm::Error writeRaw(uint32_t Offset, T Value) {
+  llvm::Error writeInteger(uint32_t Offset, T Value) {
+    static_assert(std::is_integral<T>::value, "Integer required.");
     if (auto Error = checkOffsetForWrite(Offset, sizeof(T))) {
       return Error;
     }
@@ -77,7 +69,8 @@ class ExponentialGrowthAppendingBinaryByteStream
       Data.resize(RequiredSize);
     }
 
-    ::memcpy(Data.data() + Offset, &Value, sizeof Value);
+    llvm::support::endian::write<T, llvm::support::unaligned>(
+      Data.data() + Offset, Value, Endian);
 
     return llvm::Error::success();
   }

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

@@ -103,13 +103,6 @@ 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,12 +250,6 @@ 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,15 +1918,6 @@ 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,9 +30,6 @@
 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());
 }
@@ -69,10 +66,7 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts,
   llvm::SmallString<128> LibPath(SearchPathOpts.RuntimeResourcePath);
 
   llvm::sys::path::append(LibPath, getPlatformNameForTriple(Triple));
-  SearchPathOpts.RuntimeLibraryPaths.clear();
-  SearchPathOpts.RuntimeLibraryPaths.push_back(LibPath.str());
-  if (Triple.isOSDarwin())
-    SearchPathOpts.RuntimeLibraryPaths.push_back(DARWIN_OS_LIBRARY_PATH);
+  SearchPathOpts.RuntimeLibraryPath = LibPath.str();
 
   // 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.RuntimeResourcePath;
+    StringRef resourceDir = ctx.SearchPathOpts.RuntimeLibraryPath;
     if (resourceDir.empty()) return false;
     return path.startswith(resourceDir);
   }

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

@@ -1227,23 +1227,7 @@ TypeConverter::TypeConverter(IRGenModule &IGM)
     if (!doesPlatformUseLegacyLayouts(platformName, archName))
       return;
 
-    // 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 + "'");
-    }
-
+    defaultPath.append(IGM.Context.SearchPathOpts.RuntimeLibraryPath);
     llvm::sys::path::append(defaultPath, "layouts-");
     defaultPath.append(archName);
     defaultPath.append(".yaml");

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

@@ -59,26 +59,15 @@ static void *loadRuntimeLib(StringRef runtimeLibPathWithName) {
 #endif
 }
 
-static void *loadRuntimeLibAtPath(StringRef sharedLibName,
-                                  StringRef runtimeLibPath) {
+static void *loadRuntimeLib(StringRef sharedLibName, StringRef runtimeLibPath) {
   // FIXME: Need error-checking.
   llvm::SmallString<128> Path = runtimeLibPath;
   llvm::sys::path::append(Path, sharedLibName);
   return loadRuntimeLib(Path);
 }
 
-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);
+void *swift::immediate::loadSwiftRuntime(StringRef runtimeLibPath) {
+  return loadRuntimeLib("libswiftCore" LTDL_SHLIB_EXT, runtimeLibPath);
 }
 
 static bool tryLoadLibrary(LinkLibrary linkLib,
@@ -116,9 +105,9 @@ static bool tryLoadLibrary(LinkLibrary linkLib,
     if (!success)
       success = loadRuntimeLib(stem);
 
-    // If that fails, try our runtime library paths.
+    // If that fails, try our runtime library path.
     if (!success)
-      success = loadRuntimeLib(stem, searchPathOpts.RuntimeLibraryPaths);
+      success = loadRuntimeLib(stem, searchPathOpts.RuntimeLibraryPath);
     break;
   }
   case LibraryKind::Framework: {
@@ -251,7 +240,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.RuntimeLibraryPaths);
+  auto stdlib = loadSwiftRuntime(Context.SearchPathOpts.RuntimeLibraryPath);
   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 runtimeLibPaths Paths to search for stdlib dylibs.
-void *loadSwiftRuntime(ArrayRef<std::string> runtimeLibPaths);
+/// \param runtimeLibPath Path to search for compiler-relative stdlib dylibs.
+void *loadSwiftRuntime(StringRef runtimeLibPath);
 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.RuntimeLibraryPaths)) {
+      if (!loadSwiftRuntime(Ctx.SearchPathOpts.RuntimeLibraryPath)) {
         CI.getDiags().diagnose(SourceLoc(),
                                diag::error_immediate_mode_missing_stdlib);
         return;

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

@@ -2687,22 +2687,3 @@ 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());
-}