---

yaml
---
r: 286647
b: refs/heads/master-next
c: 11c6657
h: refs/heads/master
i:
  286645: 640771d
  286643: 650504e
  286639: 5a51dfc

Author: aschwaighofer

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: a67ffadd758dfc7a0f10a8afde063b8864663208
-refs/heads/master-next: 9e1651645bd59edaca93b966af18588d6aeccf4b
+refs/heads/master-next: 11c665715cff30b648579f079ace78ef20336b55
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/benchmark/CMakeLists.txt

@@ -92,7 +92,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Hash
     single-source/Histogram
     single-source/InsertCharacter  
-    single-source/IntegerParsing
     single-source/Integrate
     single-source/IterateData
     single-source/Join

branches/master-next/benchmark/single-source/IntegerParsing.swift

@@ -80,7 +80,6 @@ import Hanoi
 import Hash
 import Histogram
 import InsertCharacter
-import IntegerParsing
 import Integrate
 import IterateData
 import Join
@@ -254,7 +253,6 @@ registerBenchmark(Hanoi)
 registerBenchmark(HashTest)
 registerBenchmark(Histogram)
 registerBenchmark(InsertCharacter)
-registerBenchmark(IntegerParsing)
 registerBenchmark(IntegrateTest)
 registerBenchmark(IterateData)
 registerBenchmark(Join)

branches/master-next/benchmark/utils/main.swift

@@ -856,9 +856,9 @@ class ASTContext final {
     return getIdentifier(getSwiftName(kind));
   }
 
-  /// Populate \p names with visible top level module names.
-  /// This guarantees that resulted \p names doesn't have duplicated names.
-  void getVisibleTopLevelModuleNames(SmallVectorImpl<Identifier> &names) const;
+  /// Collect visible clang modules from the ClangModuleLoader. These modules are
+  /// not necessarily loaded.
+  void getVisibleTopLevelClangModules(SmallVectorImpl<clang::Module*> &Modules) const;
 
 private:
   /// Register the given generic signature builder to be used as the canonical

branches/master-next/include/swift/AST/ASTContext.h

@@ -82,13 +82,6 @@ class ModuleLoader {
 public:
   virtual ~ModuleLoader() = default;
 
-  /// Collect visible module names.
-  ///
-  /// Append visible module names to \p names. Note that names are possibly
-  /// duplicated, and not guaranteed to be ordered in any way.
-  virtual void collectVisibleTopLevelModuleNames(
-      SmallVectorImpl<Identifier> &names) const = 0;
-
   /// Check whether the module with a given name can be imported without
   /// importing it.
   ///

branches/master-next/include/swift/AST/ModuleLoader.h

@@ -119,11 +119,6 @@ class ClangImporter final : public ClangModuleLoader {
   static std::shared_ptr<clang::DependencyCollector>
   createDependencyCollector(bool TrackSystemDeps);
 
-  /// Append visible module names to \p names. Note that names are possibly
-  /// duplicated, and not guaranteed to be ordered in any way.
-  void collectVisibleTopLevelModuleNames(
-      SmallVectorImpl<Identifier> &names) const override;
-
   /// Check whether the module with a given name can be imported without
   /// importing it.
   ///
@@ -341,7 +336,7 @@ class ClangImporter final : public ClangModuleLoader {
   /// Calling this function does not load the module.
   void collectSubModuleNames(
       ArrayRef<std::pair<Identifier, SourceLoc>> path,
-      std::vector<std::string> &names) const;
+      std::vector<std::string> &names);
 
   /// Given a Clang module, decide whether this module is imported already.
   static bool isModuleImported(const clang::Module *M);

branches/master-next/include/swift/ClangImporter/ClangImporter.h

@@ -66,9 +66,6 @@ class DWARFImporter final : public ClangModuleLoader {
 
   ~DWARFImporter();
 
-  void collectVisibleTopLevelModuleNames(
-      SmallVectorImpl<Identifier> &names) const override;
-
   /// Check whether the module with a given name can be imported without
   /// importing it.
   ///

branches/master-next/include/swift/DWARFImporter/DWARFImporter.h

@@ -154,11 +154,6 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
                                          RemarkOnRebuildFromInterface));
   }
 
-  /// Append visible module names to \p names. Note that names are possibly
-  /// duplicated, and not guaranteed to be ordered in any way.
-  void collectVisibleTopLevelModuleNames(
-      SmallVectorImpl<Identifier> &names) const override;
-
   /// Unconditionally build \p InPath (a swiftinterface file) to \p OutPath (as
   /// a swiftmodule file).
   ///

branches/master-next/include/swift/Frontend/ParseableInterfaceModuleLoader.h

@@ -30,14 +30,8 @@ namespace swift {
                     const llvm::PreservedAnalyses &) { return false; }
 
     using AAResultBase::getModRefInfo;
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc) {
-      llvm::AAQueryInfo AAQI;
-      return getModRefInfo(Call, Loc, AAQI);
-    }
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc,
-                                   llvm::AAQueryInfo &AAQI);
+    llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
+                                   const llvm::MemoryLocation &Loc);
   };
 
   class SwiftAAWrapperPass : public llvm::ImmutablePass {

branches/master-next/include/swift/LLVMPasses/Passes.h

@@ -0,0 +1,39 @@
+//===--- AccessedStorage.def ----------------------------*- c++ -*---------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+///
+/// A file used for metaprogramming with accessed storage. Used to enable
+/// easily updateable visitors.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef ACCESSED_STORAGE
+#error "Must define accesed storage before including this?!"
+#endif
+
+#ifndef ACCESSED_STORAGE_RANGE
+#define ACCESSED_STORAGE_RANGE(Name, Start, End)
+#endif
+
+ACCESSED_STORAGE(Box)
+ACCESSED_STORAGE(Stack)
+ACCESSED_STORAGE(Global)
+ACCESSED_STORAGE(Class)
+ACCESSED_STORAGE(Argument)
+ACCESSED_STORAGE(Yield)
+ACCESSED_STORAGE(Nested)
+ACCESSED_STORAGE(Unidentified)
+ACCESSED_STORAGE_RANGE(AccessedStorageKind, Box, Unidentified)
+
+#undef ACCESSED_STORAGE_RANGE
+#undef ACCESSED_STORAGE

branches/master-next/include/swift/SIL/AccessedStorage.def

@@ -106,15 +106,11 @@ class AccessedStorage {
   /// Enumerate over all valid begin_access bases. Clients can use a covered
   /// switch to warn if findAccessedAddressBase ever adds a case.
   enum Kind : uint8_t {
-    Box,
-    Stack,
-    Global,
-    Class,
-    Argument,
-    Yield,
-    Nested,
-    Unidentified,
-    NumKindBits = countBitsUsed(static_cast<unsigned>(Unidentified))
+#define ACCESSED_STORAGE(Name) Name,
+#define ACCESSED_STORAGE_RANGE(Name, Start, End)                               \
+  First_##Name = Start, Last_##Name = End,
+#include "swift/SIL/AccessedStorage.def"
+    NumKindBits = countBitsUsed(unsigned(Last_AccessedStorageKind))
   };
 
   static const char *getKindName(Kind k);
@@ -326,6 +322,26 @@ class AccessedStorage {
   bool operator==(const AccessedStorage &) const = delete;
   bool operator!=(const AccessedStorage &) const = delete;
 };
+
+template <class ImplTy, class ResultTy = void, typename... ArgTys>
+class AccessedStorageVisitor {
+  ImplTy &asImpl() { return static_cast<ImplTy &>(*this); }
+
+public:
+#define ACCESSED_STORAGE(Name)                                                 \
+  ResultTy visit##Name(const AccessedStorage &storage, ArgTys &&... args);
+#include "swift/SIL/AccessedStorage.def"
+
+  ResultTy visit(const AccessedStorage &storage, ArgTys &&... args) {
+    switch (storage.getKind()) {
+#define ACCESSED_STORAGE(Name)                                                 \
+  case AccessedStorage::Name:                                                  \
+    return asImpl().visit##Name(storage, std::forward<ArgTys>(args)...);
+#include "swift/SIL/AccessedStorage.def"
+    }
+  }
+};
+
 } // end namespace swift
 
 namespace llvm {

branches/master-next/include/swift/SIL/MemAccessUtils.h

@@ -48,11 +48,6 @@ class SourceLoader : public ModuleLoader {
   SourceLoader &operator=(const SourceLoader &) = delete;
   SourceLoader &operator=(SourceLoader &&) = delete;
 
-  /// Append visible module names to \p names. Note that names are possibly
-  /// duplicated, and not guaranteed to be ordered in any way.
-  void collectVisibleTopLevelModuleNames(
-      SmallVectorImpl<Identifier> &names) const override;
-
   /// Check whether the module with a given name can be imported without
   /// importing it.
   ///