---

yaml
---
r: 347486
b: refs/heads/master
c: 36b9cac
h: refs/heads/master

Author: gottesmm

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 178fca49792d023b1b2cab85e20df5993c870f24
+refs/heads/master: 36b9cac6a1c92f74c0ce61b600558b370569ebfc
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/DebuggerClient.h

@@ -61,25 +61,6 @@ class DebuggerClient {
                                SourceLoc Loc, bool IsTypeLookup,
                                ResultVector &RV) = 0;
 
-  /// The following functions allow the debugger to modify the results of a
-  /// qualfied lookup as needed. These methods may add, remove or modify the
-  /// entries in `decls`. See the corresponding DeclContext::lookupInXYZ
-  /// functions defined in NameLookup.cpp for more context.
-  ///
-
-  virtual void finishLookupInNominals(const DeclContext *dc,
-                                      ArrayRef<NominalTypeDecl *> types,
-                                      DeclName member, NLOptions options,
-                                      SmallVectorImpl<ValueDecl *> &decls) {}
-
-  virtual void finishLookupInModule(const DeclContext *dc, ModuleDecl *module,
-                                    DeclName member, NLOptions options,
-                                    SmallVectorImpl<ValueDecl *> &decls) {}
-
-  virtual void finishLookupInAnyObject(const DeclContext *dc, DeclName member,
-                                       NLOptions options,
-                                       SmallVectorImpl<ValueDecl *> &decls) {}
-
   /// When evaluating an expression in the context of an existing source file,
   /// we may want to prefer declarations from that source file.
   /// The DebuggerClient can return a private-discriminator to tell lookup to

trunk/include/swift/AST/NameLookup.h

@@ -367,10 +367,10 @@ void forAllVisibleModules(const DeclContext *DC, const Fn &fn) {
         ->forAllVisibleModules(ModuleDecl::AccessPathTy(), fn);
 }
 
-/// Once name lookup has gathered a set of results, perform any necessary
+/// Only name lookup has gathered a set of results, perform any necessary
 /// steps to prune the result set before returning it to the caller.
-void pruneLookupResultSet(const DeclContext *dc, NLOptions options,
-                          SmallVectorImpl<ValueDecl *> &decls);
+bool finishLookup(const DeclContext *dc, NLOptions options,
+                  SmallVectorImpl<ValueDecl *> &decls);
 
 /// Do nothing if debugClient is null.
 template <typename Result>

trunk/include/swift/AST/Pattern.h

@@ -221,9 +221,7 @@ class alignas(8) Pattern {
 
   void print(llvm::raw_ostream &OS,
              const PrintOptions &Options = PrintOptions()) const;
-  LLVM_ATTRIBUTE_DEPRECATED(
-      void dump() const LLVM_ATTRIBUTE_USED,
-      "only for use within the debugger");
+  void dump() const;
 
   /// walk - This recursively walks the AST rooted at this pattern.
   Pattern *walk(ASTWalker &walker);

trunk/include/swift/AST/TypeRepr.h

@@ -160,9 +160,7 @@ class alignas(8) TypeRepr {
 
   void print(raw_ostream &OS, const PrintOptions &Opts = PrintOptions()) const;
   void print(ASTPrinter &Printer, const PrintOptions &Opts) const;
-  LLVM_ATTRIBUTE_DEPRECATED(
-      void dump() const LLVM_ATTRIBUTE_USED,
-      "only for use within the debugger");
+  void dump() const;
 
   /// Clone the given type representation.
   TypeRepr *clone(const ASTContext &ctx) const;

trunk/include/swift/LLVMPasses/Passes.h

@@ -31,7 +31,13 @@ namespace swift {
 
     using AAResultBase::getModRefInfo;
     llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc);
+                                   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);
   };
 
   class SwiftAAWrapperPass : public llvm::ImmutablePass {

trunk/include/swift/Reflection/ReflectionContext.h

@@ -202,7 +202,7 @@ class ReflectionContext
                                                RangeEnd - RangeStart);
 
     auto findMachOSectionByName = [&](std::string Name)
-        -> std::pair<const char *, const char *> {
+        -> std::pair<std::pair<const char *, const char *>, uint64_t> {
       for (unsigned I = 0; I < NumSect; ++I) {
         auto S = reinterpret_cast<typename T::Section *>(
             SectionsBuf + (I * sizeof(typename T::Section)));
@@ -213,9 +213,9 @@ class ReflectionContext
         auto LocalSectStart =
             reinterpret_cast<const char *>(SectBufData + RemoteSecStart - RangeStart);
         auto LocalSectEnd = reinterpret_cast<const char *>(LocalSectStart + S->size);
-        return {LocalSectStart, LocalSectEnd};
+        return {{LocalSectStart, LocalSectEnd}, 0};
       }
-      return {nullptr, nullptr};
+      return {{nullptr, nullptr}, 0};
     };
 
     auto FieldMdSec = findMachOSectionByName("__swift5_fieldmd");
@@ -225,24 +225,24 @@ class ReflectionContext
     auto TypeRefMdSec = findMachOSectionByName("__swift5_typeref");
     auto ReflStrMdSec = findMachOSectionByName("__swift5_reflstr");
 
-    if (FieldMdSec.first == nullptr &&
-        AssocTySec.first == nullptr &&
-        BuiltinTySec.first == nullptr &&
-        CaptureSec.first == nullptr &&
-        TypeRefMdSec.first == nullptr &&
-        ReflStrMdSec.first == nullptr)
+    if (FieldMdSec.first.first == nullptr &&
+        AssocTySec.first.first == nullptr &&
+        BuiltinTySec.first.first == nullptr &&
+        CaptureSec.first.first == nullptr &&
+        TypeRefMdSec.first.first == nullptr &&
+        ReflStrMdSec.first.first == nullptr)
       return false;
 
     auto LocalStartAddress = reinterpret_cast<uint64_t>(SectBuf.get());
     auto RemoteStartAddress = static_cast<uint64_t>(RangeStart);
 
     ReflectionInfo info = {
-        {{FieldMdSec.first, FieldMdSec.second}, 0},
-        {{AssocTySec.first, AssocTySec.second}, 0},
-        {{BuiltinTySec.first, BuiltinTySec.second}, 0},
-        {{CaptureSec.first, CaptureSec.second}, 0},
-        {{TypeRefMdSec.first, TypeRefMdSec.second}, 0},
-        {{ReflStrMdSec.first, ReflStrMdSec.second}, 0},
+        {{FieldMdSec.first.first, FieldMdSec.first.second}, 0},
+        {{AssocTySec.first.first, AssocTySec.first.second}, 0},
+        {{BuiltinTySec.first.first, BuiltinTySec.first.second}, 0},
+        {{CaptureSec.first.first, CaptureSec.first.second}, 0},
+        {{TypeRefMdSec.first.first, TypeRefMdSec.first.second}, 0},
+        {{ReflStrMdSec.first.first, ReflStrMdSec.first.second}, 0},
         LocalStartAddress,
         RemoteStartAddress};
 
@@ -310,7 +310,7 @@ class ReflectionContext
         sizeof(llvm::object::coff_section) * COFFFileHdr->NumberOfSections);
 
     auto findCOFFSectionByName = [&](llvm::StringRef Name)
-        -> std::pair<const char *, const char *> {
+        -> std::pair<std::pair<const char *, const char *>, uint32_t> {
       for (size_t i = 0; i < COFFFileHdr->NumberOfSections; ++i) {
         const llvm::object::coff_section *COFFSec =
             reinterpret_cast<const llvm::object::coff_section *>(
@@ -336,43 +336,45 @@ class ReflectionContext
           End -= 8;
         }
 
-        return {Begin, End};
+        return {{Begin, End}, 0};
       }
-      return {nullptr, nullptr};
+      return {{nullptr, nullptr}, 0};
     };
 
-    std::pair<const char *, const char *> CaptureSec =
+    std::pair<std::pair<const char *, const char *>, uint32_t> CaptureSec =
         findCOFFSectionByName(".sw5cptr");
-    std::pair<const char *, const char *> TypeRefMdSec =
+    std::pair<std::pair<const char *, const char *>, uint32_t> TypeRefMdSec =
         findCOFFSectionByName(".sw5tyrf");
-    std::pair<const char *, const char *> FieldMdSec =
+    std::pair<std::pair<const char *, const char *>, uint32_t> FieldMdSec =
         findCOFFSectionByName(".sw5flmd");
-    std::pair<const char *, const char *> AssocTySec =
+    std::pair<std::pair<const char *, const char *>, uint32_t> AssocTySec =
         findCOFFSectionByName(".sw5asty");
-    std::pair<const char *, const char *> BuiltinTySec =
+    std::pair<std::pair<const char *, const char *>, uint32_t> BuiltinTySec =
         findCOFFSectionByName(".sw5bltn");
-    std::pair<const char *, const char *> ReflStrMdSec =
+    std::pair<std::pair<const char *, const char *>, uint32_t> ReflStrMdSec =
         findCOFFSectionByName(".sw5rfst");
 
-    if (FieldMdSec.first == nullptr &&
-        AssocTySec.first == nullptr &&
-        BuiltinTySec.first == nullptr &&
-        CaptureSec.first == nullptr &&
-        TypeRefMdSec.first == nullptr &&
-        ReflStrMdSec.first == nullptr)
+    if (FieldMdSec.first.first == nullptr &&
+        AssocTySec.first.first == nullptr &&
+        BuiltinTySec.first.first == nullptr &&
+        CaptureSec.first.first == nullptr &&
+        TypeRefMdSec.first.first == nullptr &&
+        ReflStrMdSec.first.first == nullptr)
       return false;
-
     auto LocalStartAddress = reinterpret_cast<uintptr_t>(DOSHdrBuf.get());
     auto RemoteStartAddress =
         static_cast<uintptr_t>(ImageStart.getAddressData());
 
     ReflectionInfo Info = {
-        {{FieldMdSec.first, FieldMdSec.second}, 0},
-        {{AssocTySec.first, AssocTySec.second}, 0},
-        {{BuiltinTySec.first, BuiltinTySec.second}, 0},
-        {{CaptureSec.first, CaptureSec.second}, 0},
-        {{TypeRefMdSec.first, TypeRefMdSec.second}, 0},
-        {{ReflStrMdSec.first, ReflStrMdSec.second}, 0},
+        {{FieldMdSec.first.first, FieldMdSec.first.second}, FieldMdSec.second},
+        {{AssocTySec.first.first, AssocTySec.first.second}, AssocTySec.second},
+        {{BuiltinTySec.first.first, BuiltinTySec.first.second},
+         BuiltinTySec.second},
+        {{CaptureSec.first.first, CaptureSec.first.second}, CaptureSec.second},
+        {{TypeRefMdSec.first.first, TypeRefMdSec.first.second},
+         TypeRefMdSec.second},
+        {{ReflStrMdSec.first.first, ReflStrMdSec.first.second},
+         ReflStrMdSec.second},
         LocalStartAddress,
         RemoteStartAddress};
     this->addReflectionInfo(Info);
@@ -448,7 +450,7 @@ class ReflectionContext
     auto StrTab = reinterpret_cast<const char *>(StrTabBuf.get());
 
     auto findELFSectionByName = [&](std::string Name)
-        -> std::pair<const char *, const char *> {
+        -> std::pair<std::pair<const char *, const char *>, uint64_t> {
       // Now for all the sections, find their name.
       for (const typename T::Section *Hdr : SecHdrVec) {
         uint32_t Offset = Hdr->sh_name;
@@ -460,9 +462,9 @@ class ReflectionContext
         auto SecSize = Hdr->sh_size;
         auto SecBuf = this->getReader().readBytes(SecStart, SecSize);
         auto SecContents = reinterpret_cast<const char *>(SecBuf.get());
-        return {SecContents, SecContents + SecSize};
+        return {{SecContents, SecContents + SecSize}, 0};
       }
-      return {nullptr, nullptr};
+      return {{nullptr, nullptr}, 0};
     };
 
     auto FieldMdSec = findELFSectionByName("swift5_fieldmd");
@@ -474,25 +476,28 @@ class ReflectionContext
 
     // We succeed if at least one of the sections is present in the
     // ELF executable.
-    if (FieldMdSec.first == nullptr &&
-        AssocTySec.first == nullptr &&
-        BuiltinTySec.first == nullptr &&
-        CaptureSec.first == nullptr &&
-        TypeRefMdSec.first == nullptr &&
-        ReflStrMdSec.first == nullptr)
+    if (FieldMdSec.first.first == nullptr &&
+        AssocTySec.first.first == nullptr &&
+        BuiltinTySec.first.first == nullptr &&
+        CaptureSec.first.first == nullptr &&
+        TypeRefMdSec.first.first == nullptr &&
+        ReflStrMdSec.first.first == nullptr)
       return false;
 
     auto LocalStartAddress = reinterpret_cast<uint64_t>(Buf.get());
     auto RemoteStartAddress =
         static_cast<uint64_t>(ImageStart.getAddressData());
 
     ReflectionInfo info = {
-        {{FieldMdSec.first, FieldMdSec.second}, 0},
-        {{AssocTySec.first, AssocTySec.second}, 0},
-        {{BuiltinTySec.first, BuiltinTySec.second}, 0},
-        {{CaptureSec.first, CaptureSec.second}, 0},
-        {{TypeRefMdSec.first, TypeRefMdSec.second}, 0},
-        {{ReflStrMdSec.first, ReflStrMdSec.second}, 0},
+        {{FieldMdSec.first.first, FieldMdSec.first.second}, FieldMdSec.second},
+        {{AssocTySec.first.first, AssocTySec.first.second}, AssocTySec.second},
+        {{BuiltinTySec.first.first, BuiltinTySec.first.second},
+         BuiltinTySec.second},
+        {{CaptureSec.first.first, CaptureSec.first.second}, CaptureSec.second},
+        {{TypeRefMdSec.first.first, TypeRefMdSec.first.second},
+         TypeRefMdSec.second},
+        {{ReflStrMdSec.first.first, ReflStrMdSec.first.second},
+         ReflStrMdSec.second},
         LocalStartAddress,
         RemoteStartAddress};
 

trunk/include/swift/SIL/SILLocation.h

@@ -687,8 +687,6 @@ class MandatoryInlinedLocation : public SILLocation {
       : SILLocation(D, MandatoryInlinedKind, F) {}
   MandatoryInlinedLocation(SourceLoc L, unsigned F)
       : SILLocation(L, MandatoryInlinedKind, F) {}
-  MandatoryInlinedLocation(DebugLoc L, unsigned F)
-      : SILLocation(L, MandatoryInlinedKind, F) {}
 };
 
 /// Used on the instruction performing auto-generated cleanup such as

trunk/include/swift/Serialization/SerializedModuleLoader.h

@@ -51,18 +51,6 @@ class SerializedModuleLoaderBase : public ModuleLoader {
                   std::unique_ptr<llvm::MemoryBuffer> *moduleDocBuffer,
                   bool &isFramework);
 
-  /// Attempts to search the provided directory for a loadable serialized
-  /// .swiftmodule with the provided `ModuleFilename`. Subclasses must
-  /// override this method to perform their custom module lookup behavior.
-  ///
-  /// If such a module could not be loaded, the subclass must return a
-  /// `std::error_code` indicating the failure. There are two specific error
-  /// codes that will be treated specially:
-  /// - `errc::no_such_file_or_directory`: The module loader will stop looking
-  ///   for loadable modules and will diagnose the lookup failure.
-  /// - `errc::not_supported`: The module loader will stop looking for loadable
-  ///   modules and will defer to the remaining module loaders to look up this
-  ///   module.
   virtual std::error_code findModuleFilesInDirectory(
       AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
       StringRef ModuleDocFilename,

trunk/lib/AST/ASTPrinter.cpp

@@ -985,33 +985,6 @@ void PrintAST::printTypedPattern(const TypedPattern *TP) {
   printTypeLoc(TP->getTypeLoc());
 }
 
-/// Determines if we are required to print the name of a property declaration,
-/// or if we can elide it by printing a '_' instead.
-static bool mustPrintPropertyName(VarDecl *decl, PrintOptions opts) {
-  // If we're not allowed to omit the name, we must print it.
-  if (!opts.OmitNameOfInaccessibleProperties) return true;
-
-  // If it contributes to the parent's storage, we must print it because clients
-  // need to be able to directly access the storage.
-  // FIXME: We might be able to avoid printing names for some of these
-  //        if we serialized references to them using field indices.
-  if (contributesToParentTypeStorage(decl)) return true;
-
-  // If it's public or @usableFromInline, we must print the name because it's a
-  // visible entry-point.
-  if (isPublicOrUsableFromInline(decl)) return true;
-
-  // If it has an initial value, we must print the name because it's used in
-  // the mangled name of the initializer expression generator function.
-  // FIXME: We _could_ figure out a way to generate an entry point
-  //        for the initializer expression without revealing the name. We just
-  //        don't have a mangling for it.
-  if (decl->hasInitialValue()) return true;
-
-  // If none of those are true, we can elide the name of the variable.
-  return false;
-}
-
 void PrintAST::printPattern(const Pattern *pattern) {
   switch (pattern->getKind()) {
   case PatternKind::Any:
@@ -1022,13 +995,16 @@ void PrintAST::printPattern(const Pattern *pattern) {
     auto named = cast<NamedPattern>(pattern);
     auto decl = named->getDecl();
     recordDeclLoc(decl, [&]{
-      // FIXME: This always returns true now, because of the FIXMEs listed in
-      //        mustPrintPropertyName.
-      if (mustPrintPropertyName(decl, Options))
-        Printer.printName(named->getBoundName());
-      else
+      if (Options.OmitNameOfInaccessibleProperties &&
+          contributesToParentTypeStorage(decl) &&
+          !isPublicOrUsableFromInline(decl) &&
+          // FIXME: We need to figure out a way to generate an entry point
+          //        for the initializer expression without revealing the name.
+          !decl->hasInitialValue())
         Printer << "_";
-    });
+      else
+        Printer.printName(named->getBoundName());
+      });
     break;
   }