---

yaml
---
r: 274431
b: refs/heads/master-next
c: 539f2cd
h: refs/heads/master
i:
  274429: 840b507
  274427: 1fb6586
  274423: f8b06b1
  274415: 8997705
  274399: f603dfe
  274367: 82f0db9
  274303: 5f39519
  274175: 26772a9
  273919: 5b43b13
  273407: ac4f043
  272383: 866b703
  270335: 4428302

Author: palimondo

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: cbef630f19f869ab5279731179bd731f12b3b9d5
-refs/heads/master-next: a19a62351d9d928b7abda0d460a7b762f29bff98
+refs/heads/master-next: 539f2cdcdf66d27396e831cb598ce828316880af
 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

@@ -77,7 +77,6 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionaryRemove
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
-    single-source/DoubleWidthDivision
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile

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

@@ -65,7 +65,6 @@ import DictionaryOfAnyHashableStrings
 import DictionaryRemove
 import DictionarySubscriptDefault
 import DictionarySwap
-import DoubleWidthDivision
 import DropFirst
 import DropLast
 import DropWhile
@@ -235,7 +234,6 @@ registerBenchmark(DictionaryOfAnyHashableStrings)
 registerBenchmark(DictionaryRemove)
 registerBenchmark(DictionarySubscriptDefault)
 registerBenchmark(DictionarySwap)
-registerBenchmark(DoubleWidthDivision)
 registerBenchmark(DropFirst)
 registerBenchmark(DropLast)
 registerBenchmark(DropWhile)

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

@@ -232,64 +232,6 @@ swiftparse_parse_string(swiftparse_parser_t, const char *source);
 /// declarations, etc.
 SWIFTPARSE_PUBLIC const char* swiftparse_syntax_structure_versioning_identifier(void);
 
-typedef struct {
-  /// Represents the range for the fixit.
-  swiftparse_range_t range;
-  /// Represent the text for replacement.
-  const char* text;
-} swiftparse_diagnostic_fixit_t;
-
-typedef enum {
-  SWIFTPARSER_DIAGNOSTIC_SEVERITY_ERROR = 0,
-  SWIFTPARSER_DIAGNOSTIC_SEVERITY_WARNING = 1,
-  SWIFTPARSER_DIAGNOSTIC_SEVERITY_NOTE = 2,
-} swiftparser_diagnostic_severity_t;
-
-/// This is for the client to ask further information about a diagnostic that is
-/// associated with the pointer.
-/// This pointer is only valid to access from within the
-/// swiftparse_diagnostic_handler_t block
-typedef const void* swiftparser_diagnostic_t;
-
-/// Invoked by the parser when a diagnostic is emitted.
-typedef void(^swiftparse_diagnostic_handler_t)(swiftparser_diagnostic_t);
-
-/// Set the \c swiftparse_diagnostic_handler_t block to be used by the parser.
-///
-/// It isn't required to set a \c swiftparse_diagnostic_handler_t block.
-SWIFTPARSE_PUBLIC void
-swiftparse_parser_set_diagnostic_handler(swiftparse_parser_t,
-                                         swiftparse_diagnostic_handler_t);
-
-/// Get the message of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC const char*
-swiftparse_diagnostic_get_message(swiftparser_diagnostic_t);
-
-/// Get the source location in byte offset to where the diagnostic is issued
-/// in the source buffer.
-SWIFTPARSE_PUBLIC
-unsigned swiftparse_diagnostic_get_source_loc(swiftparser_diagnostic_t diag);
-
-/// Get the number of fixits of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC unsigned
-swiftparse_diagnostic_get_fixit_count(swiftparser_diagnostic_t);
-
-/// Get the fixit at the specified index of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC swiftparse_diagnostic_fixit_t
-swiftparse_diagnostic_get_fixit(swiftparser_diagnostic_t, unsigned);
-
-/// Get the number of highlight ranges of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC unsigned
-swiftparse_diagnostic_get_range_count(swiftparser_diagnostic_t);
-
-/// Get the highlight range at the specified index of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC swiftparse_range_t
-swiftparse_diagnostic_get_range(swiftparser_diagnostic_t, unsigned);
-
-/// Get the severity of a swiftparser_diagnostic_t
-SWIFTPARSE_PUBLIC swiftparser_diagnostic_severity_t
-swiftparse_diagnostic_get_severity(swiftparser_diagnostic_t diag);
-
 SWIFTPARSE_END_DECLS
 
 #endif

branches/master-next/include/swift-c/SyntaxParser/SwiftSyntaxParser.h

@@ -823,11 +823,11 @@ class NumberLiteralExpr : public LiteralExpr {
   }
 };
 
+  
 /// Integer literal with a '+' or '-' sign, like '+4' or '- 2'.
 ///
-/// After semantic analysis assigns types, this is guaranteed to have
-/// a BuiltinIntegerType or be a normal type and implicitly be
-/// AnyBuiltinIntegerType.
+/// After semantic analysis assigns types, this is guaranteed to only have
+/// a BuiltinIntegerType.
 class IntegerLiteralExpr : public NumberLiteralExpr {
 public:
   IntegerLiteralExpr(StringRef Val, SourceLoc DigitsLoc, bool Implicit = false)
@@ -855,12 +855,9 @@ class IntegerLiteralExpr : public NumberLiteralExpr {
 };
 
 /// FloatLiteralExpr - Floating point literal, like '4.0'.  After semantic
-/// analysis assigns types, BuiltinTy is guaranteed to only have a
+/// analysis assigns types, this is guaranteed to only have a
 /// BuiltinFloatingPointType.
 class FloatLiteralExpr : public NumberLiteralExpr {
-  /// This is the type of the builtin literal.
-  Type BuiltinTy;
-
 public:
   FloatLiteralExpr(StringRef Val, SourceLoc Loc, bool Implicit = false)
     : NumberLiteralExpr(ExprKind::FloatLiteral, Val, Loc, Implicit)
@@ -873,9 +870,6 @@ class FloatLiteralExpr : public NumberLiteralExpr {
   static bool classof(const Expr *E) {
     return E->getKind() == ExprKind::FloatLiteral;
   }
-
-  Type getBuiltinType() const { return BuiltinTy; }
-  void setBuiltinType(Type ty) { BuiltinTy = ty; }
 };
 
 /// A Boolean literal ('true' or 'false')

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

@@ -35,9 +35,9 @@ namespace Demangle {
 
 enum class SymbolicReferenceKind : uint8_t;
 
-/// A simple default implementation that assigns letters to type parameters in
+/// A simple default implementation that assigns letters to archetypes in
 /// alphabetic order.
-std::string genericParameterName(uint64_t depth, uint64_t index);
+std::string archetypeName(uint64_t index, uint64_t depth);
 
 /// Display style options for the demangler.
 struct DemangleOptions {
@@ -57,8 +57,7 @@ struct DemangleOptions {
   bool ShortenArchetype = false;
   bool ShowPrivateDiscriminators = true;
   bool ShowFunctionArgumentTypes = true;
-  std::function<std::string(uint64_t, uint64_t)> GenericParameterName =
-      genericParameterName;
+  std::function<std::string(uint64_t, uint64_t)> ArchetypeName = archetypeName;
 
   DemangleOptions() {}
 

branches/master-next/include/swift/Demangling/Demangle.h

@@ -288,7 +288,7 @@ class ReflectionContext
   }
 
 #elif defined(_WIN32)
-  bool readPECOFFSections(RemoteAddress ImageStart) {
+  bool addImage(RemoteAddress ImageStart) {
     auto DOSHdrBuf = this->getReader().readBytes(
         ImageStart, sizeof(llvm::object::dos_header));
     auto DOSHdr =
@@ -380,29 +380,6 @@ class ReflectionContext
     return true;
   }
 
-  bool addImage(RemoteAddress ImageStart) {
-    auto Buf = this->getReader().readBytes(ImageStart,
-                                           sizeof(llvm::object::dos_header));
-    if (!Buf)
-      return false;
-
-    auto DOSHdr = reinterpret_cast<const llvm::object::dos_header *>(Buf.get());
-    if (!(DOSHdr->Magic[0] == 'M' && DOSHdr->Magic[1] == 'Z'))
-      return false;
-
-    auto PEHeaderAddress =
-        ImageStart.getAddressData() + DOSHdr->AddressOfNewExeHeader;
-
-    Buf = this->getReader().readBytes(RemoteAddress(PEHeaderAddress),
-                                      sizeof(llvm::COFF::PEMagic));
-    if (!Buf)
-      return false;
-
-    if (memcmp(Buf.get(), llvm::COFF::PEMagic, sizeof(llvm::COFF::PEMagic)))
-      return false;
-
-    return readPECOFFSections(ImageStart);
-  }
 #else // ELF platforms.
   template <typename T> bool readELFSections(RemoteAddress ImageStart) {
     auto Buf =

branches/master-next/include/swift/Reflection/ReflectionContext.h

@@ -1831,16 +1831,6 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
     printCommon(E, "float_literal_expr");
     PrintWithColorRAII(OS, LiteralValueColor)
       << " value=" << E->getDigitsText();
-    PrintWithColorRAII(OS, LiteralValueColor) << " builtin_initializer=";
-    E->getBuiltinInitializer().dump(
-        PrintWithColorRAII(OS, LiteralValueColor).getOS());
-    PrintWithColorRAII(OS, LiteralValueColor) << " initializer=";
-    E->getInitializer().dump(PrintWithColorRAII(OS, LiteralValueColor).getOS());
-    if (!E->getBuiltinType().isNull()) {
-      PrintWithColorRAII(OS, TypeColor) << " builtin_type='";
-      E->getBuiltinType().print(PrintWithColorRAII(OS, TypeColor).getOS());
-      PrintWithColorRAII(OS, TypeColor) << "'";
-    }
     PrintWithColorRAII(OS, ParenthesisColor) << ')';
   }
 

branches/master-next/lib/AST/ASTDumper.cpp

@@ -974,16 +974,8 @@ llvm::APFloat FloatLiteralExpr::getValue() const {
   assert(!getType().isNull() && "Semantic analysis has not completed");
   assert(!getType()->hasError() && "Should have a valid type");
 
-  Type ty = getType();
-  if (!ty->is<BuiltinFloatType>()) {
-    assert(!getBuiltinType().isNull() && "Semantic analysis has not completed");
-    assert(!getBuiltinType()->hasError() && "Should have a valid type");
-    ty = getBuiltinType();
-  }
-
-  return getFloatLiteralValue(
-      isNegative(), getDigitsText(),
-      ty->castTo<BuiltinFloatType>()->getAPFloatSemantics());
+  return getFloatLiteralValue(isNegative(), getDigitsText(),
+                  getType()->castTo<BuiltinFloatType>()->getAPFloatSemantics());
 }
 
 StringLiteralExpr::StringLiteralExpr(StringRef Val, SourceRange Range,

branches/master-next/lib/AST/Expr.cpp

@@ -143,22 +143,12 @@ bool TaskQueue::execute(TaskBeganCallback Began, TaskFinishedCallback Finished,
       stderrContents = stderrBuffer.get()->getBuffer();
     }
 
-#if defined(_WIN32)
-    // Wait() sets the upper two bits of the return code to indicate warnings
-    // (10) and errors (11).
-    //
-    // This isn't a true signal on Windows, but we'll treat it as such so that
-    // we clean up after it properly
-    bool crashed = ReturnCode & 0xC0000000;
-#else
+    if (ReturnCode == -2) {
       // Wait() returning a return code of -2 indicates the process received
       // a signal during execution.
-    bool crashed = ReturnCode == -2;
-#endif
-    if (crashed) {
       if (Signalled) {
         TaskFinishedResponse Response =
-            Signalled(PI.Pid, ErrMsg, stdoutContents, stderrContents, T->Context, ReturnCode, TaskProcessInformation(PI.Pid));
+            Signalled(PI.Pid, ErrMsg, stdoutContents, stderrContents, T->Context, None, TaskProcessInformation(PI.Pid));
         ContinueExecution = Response != TaskFinishedResponse::StopExecution;
       } else {
         // If we don't have a Signalled callback, unconditionally stop.

branches/master-next/lib/Basic/Default/TaskQueue.inc

@@ -50,7 +50,7 @@ DemanglerPrinter &DemanglerPrinter::operator<<(long long n) & {
   return *this;
 }
 
-std::string Demangle::genericParameterName(uint64_t depth, uint64_t index) {
+std::string Demangle::archetypeName(uint64_t index, uint64_t depth) {
   DemanglerPrinter name;
   do {
     name << (char)('A' + (index % 26));
@@ -1958,7 +1958,7 @@ NodePointer NodePrinter::print(NodePointer Node, bool asPrefixContext) {
         }
         // FIXME: Depth won't match when a generic signature applies to a
         // method in generic type context.
-        Printer << Options.GenericParameterName(depth, index);
+        Printer << Options.ArchetypeName(index, depth);
       }
     }
 
@@ -2036,7 +2036,7 @@ NodePointer NodePrinter::print(NodePointer Node, bool asPrefixContext) {
   case Node::Kind::DependentGenericParamType: {
     unsigned index = Node->getChild(1)->getIndex();
     unsigned depth = Node->getChild(0)->getIndex();
-    Printer << Options.GenericParameterName(depth, index);
+    Printer << Options.ArchetypeName(index, depth);
     return nullptr;
   }
   case Node::Kind::DependentGenericType: {

branches/master-next/lib/Demangling/NodePrinter.cpp

@@ -1374,7 +1374,7 @@ class OldDemangler {
 
   NodePointer getDependentGenericParamType(unsigned depth, unsigned index) {
     DemanglerPrinter PrintName;
-    PrintName << genericParameterName(depth, index);
+    PrintName << archetypeName(index, depth);
 
     auto paramTy = Factory.createNode(Node::Kind::DependentGenericParamType);
     paramTy->addChild(Factory.createNode(Node::Kind::Index, depth), Factory);

branches/master-next/lib/Demangling/OldDemangler.cpp

@@ -1840,15 +1840,8 @@ CanAnyFunctionType TypeConverter::makeConstantInterfaceType(SILDeclRef c) {
     return getFunctionInterfaceTypeWithCaptures(funcTy, func);
   }
 
-  case SILDeclRef::Kind::EnumElement: {
-    auto funcTy = cast<AnyFunctionType>(
-                                   vd->getInterfaceType()->getCanonicalType());
-    auto sig = getEffectiveGenericSignature(vd->getDeclContext());
-    return CanAnyFunctionType::get(sig,
-                                   funcTy->getParams(),
-                                   funcTy.getResult(),
-                                   funcTy->getExtInfo());
-  }
+  case SILDeclRef::Kind::EnumElement:
+    return cast<AnyFunctionType>(vd->getInterfaceType()->getCanonicalType());
 
   case SILDeclRef::Kind::Allocator: {
     auto *cd = cast<ConstructorDecl>(vd);

branches/master-next/lib/SIL/TypeLowering.cpp

@@ -5543,21 +5543,10 @@ RValue SILGenFunction::emitLiteral(LiteralExpr *literal, SGFContext C) {
             integerLiteral,
             SILType::getBuiltinIntegerLiteralType(getASTContext()),
             integerLiteral->getRawValue()));
-    CanType ty = integerManaged.getType().getASTType();
+    CanType ty = integerManaged.getType().getASTType()->getCanonicalType();
     builtinLiteralArgs = RValue(*this, {integerManaged}, ty);
     builtinInit = integerLiteral->getBuiltinInitializer();
     init = integerLiteral->getInitializer();
-  } else if (auto floatLiteral = dyn_cast<FloatLiteralExpr>(literal)) {
-    auto *litTy = floatLiteral->getBuiltinType()->castTo<BuiltinFloatType>();
-    ManagedValue floatManaged = ManagedValue::forUnmanaged(B.createFloatLiteral(
-        floatLiteral,
-        SILType::getBuiltinFloatType(litTy->getFPKind(), getASTContext()),
-        floatLiteral->getValue()));
-
-    CanType ty = floatManaged.getType().getASTType();
-    builtinLiteralArgs = RValue(*this, {floatManaged}, ty);
-    builtinInit = floatLiteral->getBuiltinInitializer();
-    init = floatLiteral->getInitializer();
   } else {
     ASTContext &ctx = getASTContext();
     SourceLoc loc = literal->getStartLoc();