---

yaml
---
r: 348774
b: refs/heads/master
c: 8b8c88e
h: refs/heads/master

Author: jrose-apple

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 414a4e2a1cd8c506ea84018d4af8d8d0c88413ff
+refs/heads/master: 8b8c88e258ab5c8b1977b34d7f83e3911a8c09dc
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/docs/WindowsBuild.md

@@ -186,11 +186,13 @@ cmake -G "Visual Studio 2017" -A x64 -T "host=x64"^ ...
 md "S:\b\lldb"
 cd "S:\b\lldb"
 cmake -G Ninja^
-  -DLLVM_DIR="S:/b/llvm/lib/cmake/llvm"^
-  -DClang_DIR="S:/b/llvm/lib/cmake/clang"^
-  -DSwift_DIR="S:/b/swift/lib/cmake/swift"^
   -DCMAKE_BUILD_TYPE=RelWithDebInfo^
   -DLLDB_ALLOW_STATIC_BINDINGS=YES^
+  -DLLDB_PATH_TO_CLANG_SOURCE="S:\clang"^
+  -DLLDB_PATH_TO_SWIFT_SOURCE="S:\swift"^
+  -DLLDB_PATH_TO_CLANG_BUILD="S:\b\llvm"^
+  -DLLDB_PATH_TO_LLVM_BUILD="S:\b\llvm"^
+  -DLLDB_PATH_TO_SWIFT_BUILD="S:\b\swift"^
   -DLLVM_ENABLE_ASSERTIONS=ON^
   -DPYTHON_HOME="%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64"^
   S:\lldb

trunk/include/swift/AST/DiagnosticConsumer.h

@@ -38,17 +38,10 @@ enum class DiagnosticKind : uint8_t {
   Note
 };
 
-/// Information about a diagnostic passed to DiagnosticConsumers.
+/// Extra information carried along with a diagnostic, which may or
+/// may not be of interest to a given diagnostic consumer.
 struct DiagnosticInfo {
   DiagID ID = DiagID(0);
-  SourceLoc Loc;
-  DiagnosticKind Kind;
-  StringRef FormatString;
-  ArrayRef<DiagnosticArgument> FormatArgs;
-  SourceLoc BufferIndirectlyCausingDiagnostic;
-
-  /// DiagnosticInfo of notes which are children of this diagnostic, if any
-  ArrayRef<DiagnosticInfo *> ChildDiagnosticInfo;
 
   /// Represents a fix-it, a replacement of one range of text with another.
   class FixIt {
@@ -67,24 +60,6 @@ struct DiagnosticInfo {
 
   /// Extra source ranges that are attached to the diagnostic.
   ArrayRef<FixIt> FixIts;
-
-  /// This is a note which has a parent error or warning
-  bool IsChildNote = false;
-
-  DiagnosticInfo() {}
-
-  DiagnosticInfo(DiagID ID, SourceLoc Loc, DiagnosticKind Kind,
-                 StringRef FormatString,
-                 ArrayRef<DiagnosticArgument> FormatArgs,
-                 SourceLoc BufferIndirectlyCausingDiagnostic,
-                 ArrayRef<DiagnosticInfo *> ChildDiagnosticInfo,
-                 ArrayRef<CharSourceRange> Ranges, ArrayRef<FixIt> FixIts,
-                 bool IsChildNote)
-      : ID(ID), Loc(Loc), Kind(Kind), FormatString(FormatString),
-        FormatArgs(FormatArgs),
-        BufferIndirectlyCausingDiagnostic(BufferIndirectlyCausingDiagnostic),
-        ChildDiagnosticInfo(ChildDiagnosticInfo), Ranges(Ranges),
-        FixIts(FixIts), IsChildNote(IsChildNote) {}
 };
 
 /// Abstract interface for classes that present diagnostics to the user.

trunk/include/swift/AST/DiagnosticEngine.h

@@ -337,9 +337,7 @@ namespace swift {
     SmallVector<DiagnosticArgument, 3> Args;
     SmallVector<CharSourceRange, 2> Ranges;
     SmallVector<FixIt, 2> FixIts;
-    std::vector<Diagnostic> ChildNotes;
     SourceLoc Loc;
-    bool IsChildNote = false;
     const Decl *Decl = nullptr;
 
     friend DiagnosticEngine;
@@ -364,13 +362,10 @@ namespace swift {
     ArrayRef<DiagnosticArgument> getArgs() const { return Args; }
     ArrayRef<CharSourceRange> getRanges() const { return Ranges; }
     ArrayRef<FixIt> getFixIts() const { return FixIts; }
-    ArrayRef<Diagnostic> getChildNotes() const { return ChildNotes; }
-    bool isChildNote() const { return IsChildNote; }
     SourceLoc getLoc() const { return Loc; }
     const class Decl *getDecl() const { return Decl; }
 
     void setLoc(SourceLoc loc) { Loc = loc; }
-    void setIsChildNote(bool isChildNote) { IsChildNote = isChildNote; }
     void setDecl(const class Decl *decl) { Decl = decl; }
 
     /// Returns true if this object represents a particular diagnostic.
@@ -391,8 +386,6 @@ namespace swift {
     void addFixIt(FixIt &&F) {
       FixIts.push_back(std::move(F));
     }
-
-    void addChildNote(Diagnostic &&D);
   };
 
   /// Describes an in-flight diagnostic, which is currently active
@@ -672,8 +665,7 @@ namespace swift {
 
     friend class InFlightDiagnostic;
     friend class DiagnosticTransaction;
-    friend class CompoundDiagnosticTransaction;
-
+    
   public:
     explicit DiagnosticEngine(SourceManager &SourceMgr)
         : SourceMgr(SourceMgr), ActiveDiagnostic(),
@@ -886,15 +878,6 @@ namespace swift {
       return diagnose(decl, Diagnostic(id, std::move(args)...));
     }
 
-    /// Emit a parent diagnostic and attached notes.
-    ///
-    /// \param parentDiag An InFlightDiagnostic representing the parent diag.
-    ///
-    /// \param builder A closure which builds and emits notes to be attached to
-    /// the parent diag.
-    void diagnoseWithNotes(InFlightDiagnostic parentDiag,
-                           llvm::function_ref<void(void)> builder);
-
     /// \returns true if diagnostic is marked with PointsToFirstBadToken
     /// option.
     bool isDiagnosticPointsToFirstBadToken(DiagID id) const;
@@ -922,10 +905,6 @@ namespace swift {
     /// Retrieve the active diagnostic.
     Diagnostic &getActiveDiagnostic() { return *ActiveDiagnostic; }
 
-    /// Generate DiagnosticInfo for a Diagnostic to be passed to consumers.
-    Optional<DiagnosticInfo>
-    diagnosticInfoForDiagnostic(const Diagnostic &diagnostic);
-
     /// Send \c diag to all diagnostic consumers.
     void emitDiagnostic(const Diagnostic &diag);
 
@@ -966,7 +945,6 @@ namespace swift {
   /// in LIFO order. An open transaction is implicitly committed upon
   /// destruction.
   class DiagnosticTransaction {
-  protected:
     DiagnosticEngine &Engine;
 
     /// How many tentative diagnostics there were when the transaction
@@ -990,6 +968,7 @@ namespace swift {
         Depth(Engine.TransactionCount),
         IsOpen(true)
     {
+      assert(!Engine.ActiveDiagnostic);
       Engine.TransactionCount++;
     }
 
@@ -1032,61 +1011,6 @@ namespace swift {
              "transactions must be closed LIFO");
     }
   };
-
-  /// Represents a diagnostic transaction which constructs a compound diagnostic
-  /// from any diagnostics emitted inside. A compound diagnostic consists of a
-  /// parent error, warning, or remark followed by a variable number of child
-  /// notes. The semantics are otherwise the same as a regular
-  /// DiagnosticTransaction.
-  class CompoundDiagnosticTransaction : public DiagnosticTransaction {
-  public:
-    explicit CompoundDiagnosticTransaction(DiagnosticEngine &engine)
-        : DiagnosticTransaction(engine) {}
-
-    ~CompoundDiagnosticTransaction() {
-      if (IsOpen) {
-        commit();
-      }
-
-      if (Depth == 0) {
-        Engine.TransactionStrings.clear();
-        Engine.TransactionAllocator.Reset();
-      }
-    }
-
-    void commit() {
-      assert(PrevDiagnostics < Engine.TentativeDiagnostics.size() &&
-             "CompoundDiagnosticTransaction must contain at least one diag");
-
-      // The first diagnostic is assumed to be the parent. If this is not an
-      // error or warning, we'll assert later when trying to add children.
-      Diagnostic &parent = Engine.TentativeDiagnostics[PrevDiagnostics];
-
-      // Associate the children with the parent.
-      for (auto diag =
-               Engine.TentativeDiagnostics.begin() + PrevDiagnostics + 1;
-           diag != Engine.TentativeDiagnostics.end(); ++diag) {
-        diag->setIsChildNote(true);
-        parent.addChildNote(std::move(*diag));
-      }
-
-      // Erase the children, they'll be emitted alongside their parent.
-      Engine.TentativeDiagnostics.erase(Engine.TentativeDiagnostics.begin() +
-                                            PrevDiagnostics + 1,
-                                        Engine.TentativeDiagnostics.end());
-
-      DiagnosticTransaction::commit();
-    }
-  };
-
-  inline void
-  DiagnosticEngine::diagnoseWithNotes(InFlightDiagnostic parentDiag,
-                                      llvm::function_ref<void(void)> builder) {
-    CompoundDiagnosticTransaction transaction(*this);
-    parentDiag.flush();
-    builder();
-  }
-
 } // end namespace swift
 
 #endif

trunk/include/swift/AST/Identifier.h

@@ -56,26 +56,8 @@ class Identifier {
 
   const char *Pointer;
 
-public:
-  enum : size_t {
-    NumLowBitsAvailable = 2,
-    RequiredAlignment = 1 << NumLowBitsAvailable,
-    SpareBitMask = ((intptr_t)1 << NumLowBitsAvailable) - 1
-  };
-
-private:
   /// Constructor, only accessible by ASTContext, which handles the uniquing.
-  explicit Identifier(const char *Ptr) : Pointer(Ptr) {
-    assert(((uintptr_t)Ptr & SpareBitMask) == 0
-           && "Identifier pointer does not use any spare bits");
-  }
-
-  /// A type with the alignment expected of a valid \c Identifier::Pointer .
-  struct alignas(uint32_t) Aligner {};
-
-  static_assert(alignof(Aligner) >= RequiredAlignment,
-                "Identifier table will provide enough spare bits");
-
+  explicit Identifier(const char *Ptr) : Pointer(Ptr) {}
 public:
   explicit Identifier() : Pointer(nullptr) {}
 
@@ -171,15 +153,12 @@ class Identifier {
   bool operator<(Identifier RHS) const { return Pointer < RHS.Pointer; }
 
   static Identifier getEmptyKey() {
-    uintptr_t Val = static_cast<uintptr_t>(-1);
-    Val <<= NumLowBitsAvailable;
-    return Identifier((const char*)Val);
+    return Identifier((const char*)
+                      llvm::DenseMapInfo<const void*>::getEmptyKey());
   }
-
   static Identifier getTombstoneKey() {
-    uintptr_t Val = static_cast<uintptr_t>(-2);
-    Val <<= NumLowBitsAvailable;
-    return Identifier((const char*)Val);
+    return Identifier((const char*)
+                      llvm::DenseMapInfo<const void*>::getTombstoneKey());
   }
 
 private:
@@ -223,7 +202,7 @@ namespace llvm {
     static inline swift::Identifier getFromVoidPointer(void *P) {
       return swift::Identifier::getFromOpaquePointer(P);
     }
-    enum { NumLowBitsAvailable = swift::Identifier::NumLowBitsAvailable };
+    enum { NumLowBitsAvailable = 2 };
   };
 
 } // end namespace llvm
@@ -242,15 +221,15 @@ class DeclBaseName {
   };
 
 private:
-  /// In a special DeclName representing a subscript, this opaque pointer
+  /// In a special DeclName represenenting a subscript, this opaque pointer
   /// is used as the data of the base name identifier.
   /// This is an implementation detail that should never leak outside of
   /// DeclName.
-  static const Identifier::Aligner SubscriptIdentifierData;
+  static void *SubscriptIdentifierData;
   /// As above, for special constructor DeclNames.
-  static const Identifier::Aligner ConstructorIdentifierData;
+  static void *ConstructorIdentifierData;
   /// As above, for special destructor DeclNames.
-  static const Identifier::Aligner DestructorIdentifierData;
+  static void *DestructorIdentifierData;
 
   Identifier Ident;
 
@@ -260,23 +239,23 @@ class DeclBaseName {
   DeclBaseName(Identifier I) : Ident(I) {}
 
   static DeclBaseName createSubscript() {
-    return DeclBaseName(Identifier((const char *)&SubscriptIdentifierData));
+    return DeclBaseName(Identifier((const char *)SubscriptIdentifierData));
   }
 
   static DeclBaseName createConstructor() {
-    return DeclBaseName(Identifier((const char *)&ConstructorIdentifierData));
+    return DeclBaseName(Identifier((const char *)ConstructorIdentifierData));
   }
 
   static DeclBaseName createDestructor() {
-    return DeclBaseName(Identifier((const char *)&DestructorIdentifierData));
+    return DeclBaseName(Identifier((const char *)DestructorIdentifierData));
   }
 
   Kind getKind() const {
-    if (Ident.get() == (const char *)&SubscriptIdentifierData) {
+    if (Ident.get() == SubscriptIdentifierData) {
       return Kind::Subscript;
-    } else if (Ident.get() == (const char *)&ConstructorIdentifierData) {
+    } else if (Ident.get() == ConstructorIdentifierData) {
       return Kind::Constructor;
-    } else if (Ident.get() == (const char *)&DestructorIdentifierData) {
+    } else if (Ident.get() == DestructorIdentifierData) {
         return Kind::Destructor;
     } else {
       return Kind::Normal;
@@ -741,7 +720,7 @@ namespace llvm {
     static inline swift::DeclName getFromVoidPointer(void *ptr) {
       return swift::DeclName::getFromOpaqueValue(ptr);
     }
-    enum { NumLowBitsAvailable = PointerLikeTypeTraits<swift::DeclBaseName>::NumLowBitsAvailable - 2 };
+    enum { NumLowBitsAvailable = 0 };
   };
 
   // DeclNames hash just like pointers.

trunk/include/swift/Basic/STLExtras.h

@@ -488,7 +488,7 @@ class TransformRange {
   Operation Op;
 
 public:
-  using iterator = TransformIterator<typename Range::iterator, Operation>;
+  using iterator = TransformIterator<decltype(Rng.begin()), Operation>;
 
   TransformRange(Range range, Operation op)
     : Rng(range), Op(op) { }
@@ -497,6 +497,20 @@ class TransformRange {
   iterator end() const { return iterator(Rng.end(), Op); }
   bool empty() const { return begin() == end(); }
 
+  // The dummy template parameter keeps 'size()' from being eagerly
+  // instantiated.
+  template <typename Dummy = Range>
+  typename function_traits<decltype(&Dummy::size)>::result_type
+  size() const {
+    return Rng.size();
+  }
+
+  template <typename Index>
+  typename function_traits<Operation>::result_type
+  operator[](Index index) const {
+    return Op(Rng[index]);
+  }
+
   typename std::iterator_traits<iterator>::value_type front() const { 
     assert(!empty() && "Front of empty range");
     return *begin();