---

yaml
---
r: 348762
b: refs/heads/master
c: d535e3e
h: refs/heads/master

Author: gottesmm

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 03edea344d190b65131d4efc2839b8e1b713ed20
+refs/heads/master: d535e3e6cf767f40620ca1e5eeb21fd3e7bf3b1c
 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/ClangImporter/ClangImporterOptions.h

@@ -103,8 +103,7 @@ class ClangImporterOptions {
     using llvm::hash_combine;
 
     auto Code = hash_value(ModuleCachePath);
-    Code = hash_combine(Code, llvm::hash_combine_range(ExtraArgs.begin(),
-                                                       ExtraArgs.end()));
+    // ExtraArgs ignored - already considered in Clang's module hashing.
     Code = hash_combine(Code, OverrideResourceDir);
     Code = hash_combine(Code, TargetCPU);
     Code = hash_combine(Code, BridgingHeader);

trunk/include/swift/Frontend/PrintingDiagnosticConsumer.h

@@ -50,13 +50,6 @@ class PrintingDiagnosticConsumer : public DiagnosticConsumer {
   bool didErrorOccur() {
     return DidErrorOccur;
   }
-
-private:
-  void printDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                       StringRef FormatString,
-                       ArrayRef<DiagnosticArgument> FormatArgs,
-                       const DiagnosticInfo &Info,
-                       SourceLoc bufferIndirectlyCausingDiagnostic);
 };
 
 }

trunk/include/swift/SIL/OptimizationRemark.h

@@ -157,9 +157,9 @@ class Emitter {
     using RemarkT = decltype(RemarkBuilder());
     // Avoid building the remark unless remarks are enabled.
     if (isEnabled<RemarkT>() || Module.getOptRecordStream()) {
-      auto rb = RemarkBuilder();
-      rb.setPassName(PassName);
-      emit(rb);
+      auto R = RemarkBuilder();
+      R.setPassName(PassName);
+      emit(R);
     }
   }
 

trunk/include/swift/SIL/SILGlobalVariable.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_SIL_SILGLOBALVARIABLE_H
 #define SWIFT_SIL_SILGLOBALVARIABLE_H
 
+#include <string>
 #include "swift/SIL/SILLinkage.h"
 #include "swift/SIL/SILLocation.h"
 #include "swift/SIL/SILBasicBlock.h"

trunk/include/swift/SIL/SILInstructionWorklist.h

@@ -33,7 +33,7 @@
 #include "swift/Basic/BlotSetVector.h"
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/SILValue.h"
-#include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/Local.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallVector.h"
 

trunk/include/swift/SIL/SILValue.h

@@ -387,6 +387,18 @@ class SILValue {
           NumLowBitsAvailable
   };
 
+  /// If this SILValue is a result of an instruction, return its
+  /// defining instruction. Returns nullptr otherwise.
+  SILInstruction *getDefiningInstruction() {
+    return Value->getDefiningInstruction();
+  }
+
+  /// If this SILValue is a result of an instruction, return its
+  /// defining instruction. Returns nullptr otherwise.
+  const SILInstruction *getDefiningInstruction() const {
+    return Value->getDefiningInstruction();
+  }
+
   /// Returns the ValueOwnershipKind that describes this SILValue's ownership
   /// semantics if the SILValue has ownership semantics. Returns is a value
   /// without any Ownership Semantics.

trunk/include/swift/SIL/TypeSubstCloner.h

@@ -21,10 +21,10 @@
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/Type.h"
-#include "swift/SIL/DynamicCasts.h"
 #include "swift/SIL/SILCloner.h"
+#include "swift/SIL/DynamicCasts.h"
 #include "swift/SIL/SILFunctionBuilder.h"
-#include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/Local.h"
 #include "swift/SILOptimizer/Utils/SpecializationMangler.h"
 #include "llvm/Support/Debug.h"
 

trunk/include/swift/SILOptimizer/Analysis/CFG.h

@@ -0,0 +1,50 @@
+//===--- CFG.h - Routines which analyze the CFG of a function ---*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_CFG_H
+#define SWIFT_SILOPTIMIZER_ANALYSIS_CFG_H
+
+namespace llvm {
+
+template <typename T> class TinyPtrVector;
+
+} // end namespace llvm
+
+namespace swift {
+
+class SILFunction;
+class SILBasicBlock;
+
+/// Return true if we conservatively find all BB's that are non-failure exit
+/// basic blocks and place them in \p BBs. If we find something we don't
+/// understand, bail.
+///
+/// A non-failure exit BB is defined as a BB that:
+///
+/// 1. Has a return terminator.
+/// 2. unreachable + noreturn terminator sequence.
+/// 3. has a throw terminator.
+///
+/// If we just have an unreachable without a noreturn call before it, we must
+/// have a failure BB.
+///
+/// We use a TinyPtrVector since in most cases this will only return one
+/// SILBasicBlock since non-failure noreturn functions should not occur often
+/// implying in most cases this will be one element.
+///
+/// TODO:
+bool findAllNonFailureExitBBs(SILFunction *F,
+                              llvm::TinyPtrVector<SILBasicBlock *> &BBs);
+
+} // end namespace swift
+
+#endif

trunk/include/swift/SILOptimizer/Analysis/CallerAnalysis.h

@@ -17,7 +17,7 @@
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/SILModule.h"
 #include "swift/SILOptimizer/Analysis/Analysis.h"
-#include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/Local.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"