---

yaml
---
r: 278526
b: refs/heads/swift-5.1-old-llvm-branch
c: 5160da6
h: refs/heads/master

Author: pschuh

[refs]

@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
 refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
-refs/heads/swift-5.1-old-llvm-branch: e8219a5d04f660131f3e03866be5407c8537d1ee
+refs/heads/swift-5.1-old-llvm-branch: 5160da6a2e0f4c279f883dbf56ce8baf56fba30e
 refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/benchmark/single-source/ArrayInClass.swift

@@ -17,12 +17,11 @@ public let ArrayInClass = [
     runFunction: run_ArrayInClass,
     tags: [.validation, .api, .Array],
     setUpFunction: { ac = ArrayContainer() },
-    tearDownFunction: { ac = nil },
-    legacyFactor: 5),
+    tearDownFunction: { ac = nil }),
   BenchmarkInfo(name: "DistinctClassFieldAccesses",
     runFunction: run_DistinctClassFieldAccesses,
-    tags: [.validation, .api, .Array],
-    setUpFunction: { workload = ClassWithArrs(N: 10_000) },
+    tags: [.unstable, .api, .Array],
+    setUpFunction: { workload = ClassWithArrs(N: 100_000) },
     tearDownFunction: { workload = nil }),
 ]
 
@@ -32,7 +31,7 @@ class ArrayContainer {
   final var arr : [Int]
 
   init() {
-    arr = [Int] (repeating: 0, count: 20_000)
+    arr = [Int] (repeating: 0, count: 100_000)
   }
 
   func runLoop(_ N: Int) {

branches/swift-5.1-old-llvm-branch/benchmark/single-source/DictionaryOfAnyHashableStrings.swift

@@ -21,15 +21,18 @@ public var DictionaryOfAnyHashableStrings = [
     name: "DictionaryOfAnyHashableStrings_insert",
     runFunction: run_DictionaryOfAnyHashableStrings_insert,
     tags: [.abstraction, .runtime, .cpubench],
-    setUpFunction: { keys = buildKeys(50) },
-    legacyFactor: 14
+    setUpFunction: {
+      keys = buildKeys(500)
+    }
   ),
   BenchmarkInfo(
     name: "DictionaryOfAnyHashableStrings_lookup",
     runFunction: run_DictionaryOfAnyHashableStrings_lookup,
     tags: [.abstraction, .runtime, .cpubench],
-    setUpFunction: { keys = buildKeys(50); workload = buildWorkload() },
-    legacyFactor: 24
+    setUpFunction: {
+      keys = buildKeys(500)
+      workload = buildWorkload()
+    }
   ),
 ]
 
@@ -62,7 +65,7 @@ func buildWorkload() -> [AnyHashable: Any] {
 @inline(never)
 public func run_DictionaryOfAnyHashableStrings_insert(_ n: Int) {
   precondition(keys.count > 0)
-  for _ in 1...n {
+  for _ in 0 ... n {
     blackHole(buildWorkload())
   }
 }
@@ -71,7 +74,7 @@ public func run_DictionaryOfAnyHashableStrings_insert(_ n: Int) {
 public func run_DictionaryOfAnyHashableStrings_lookup(_ n: Int) {
   precondition(workload.count > 0)
   precondition(keys.count > 0)
-  for _ in 1...n {
+  for _ in 0 ... n {
     for i in 0 ..< keys.count {
       let key = keys[i]
       CheckResults((workload[key] as! Int) == i)

branches/swift-5.1-old-llvm-branch/benchmark/single-source/Substring.swift

@@ -31,8 +31,6 @@ public let SubstringTest = [
 
 // A string that doesn't fit in small string storage and doesn't fit in Latin-1
 let longWide = "fὢasὢodὢijὢadὢolὢsjὢalὢsdὢjlὢasὢdfὢijὢliὢsdὢjøὢslὢdiὢalὢiὢ"
-let (s1, ss1) = equivalentWithDistinctBuffers()
-let (s2, ss2) = equivalentWithDistinctBuffers()
 
 @inline(never)
 public func run_SubstringFromLongString(_ N: Int) {
@@ -91,33 +89,33 @@ private func equivalentWithDistinctBuffers() -> (String, Substring) {
 
 @inline(never)
 public func run_EqualStringSubstring(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     blackHole(a == b)
   }
 }
 
 @inline(never)
 public func run_EqualSubstringString(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     blackHole(b == a)
   }
 }
 
 @inline(never)
 public func run_EqualSubstringSubstring(_ N: Int) {
-  let (_, a) = (s1, ss1)
-  let (_, b) = (s2, ss2)
+  let (_, a) = equivalentWithDistinctBuffers()
+  let (_, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     blackHole(a == b)
   }
 }
 
 @inline(never)
 public func run_EqualSubstringSubstringGenericEquatable(_ N: Int) {
-  let (_, a) = (s1, ss1)
-  let (_, b) = (s2, ss2)
+  let (_, a) = equivalentWithDistinctBuffers()
+  let (_, b) = equivalentWithDistinctBuffers()
   func check<T>(_ x: T, _ y: T) where T : Equatable {
     blackHole(x == y)
   }
@@ -134,24 +132,24 @@ where T : StringProtocol, U : StringProtocol {
 
 @inline(never)
 public func run _EqualStringSubstringGenericStringProtocol(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     checkEqual(a, b)
   }
 }
 
 @inline(never)
 public func run _EqualSubstringStringGenericStringProtocol(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     checkEqual(b, a)
   }
 }
 
 @inline(never)
 public func run _EqualSubstringSubstringGenericStringProtocol(_ N: Int) {
-  let (_, a) = (s1, ss1)
-  let (_, b) = (s2, ss2)
+  let (_, a) = equivalentWithDistinctBuffers()
+  let (_, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     checkEqual(a, b)
   }
@@ -163,15 +161,15 @@ public func run _EqualSubstringSubstringGenericStringProtocol(_ N: Int) {
 /*
 @inline(never)
 public func run _LessStringSubstring(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     blackHole(a < b)
   }
 }
 
 @inline(never)
 public func run _LessSubstringString(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     blackHole(b < a)
   }
@@ -180,17 +178,17 @@ public func run _LessSubstringString(_ N: Int) {
 
 @inline(never)
 public func run_LessSubstringSubstring(_ N: Int) {
-  let (_, a) = (s1, ss1)
-  let (_, b) = (s2, ss2)
+  let (_, a) = equivalentWithDistinctBuffers()
+  let (_, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     blackHole(a < b)
   }
 }
 
 @inline(never)
 public func run_LessSubstringSubstringGenericComparable(_ N: Int) {
-  let (_, a) = (s1, ss1)
-  let (_, b) = (s2, ss2)
+  let (_, a) = equivalentWithDistinctBuffers()
+  let (_, b) = equivalentWithDistinctBuffers()
   func check<T>(_ x: T, _ y: T) where T : Comparable {
     blackHole(x < y)
   }
@@ -253,24 +251,24 @@ where T : StringProtocol, U : StringProtocol {
 
 @inline(never)
 public func run _LessStringSubstringGenericStringProtocol(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     checkLess(a, b)
   }
 }
 
 @inline(never)
 public func run _LessSubstringStringGenericStringProtocol(_ N: Int) {
-  let (a, b) = (s1, ss1)
+  let (a, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     checkLess(b, a)
   }
 }
 
 @inline(never)
 public func run _LessSubstringSubstringGenericStringProtocol(_ N: Int) {
-  let (_, a) = (s1, ss1)
-  let (_, b) = (s2, ss2)
+  let (_, a) = equivalentWithDistinctBuffers()
+  let (_, b) = equivalentWithDistinctBuffers()
   for _ in 1...N*500 {
     checkLess(a, b)
   }

branches/swift-5.1-old-llvm-branch/include/swift/AST/Expr.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 only have
-/// a BuiltinIntegerType.
+/// After semantic analysis assigns types, this is guaranteed to have
+/// a BuiltinIntegerType or be a normal type and implicitly be
+/// AnyBuiltinIntegerType.
 class IntegerLiteralExpr : public NumberLiteralExpr {
 public:
   IntegerLiteralExpr(StringRef Val, SourceLoc DigitsLoc, bool Implicit = false)
@@ -855,9 +855,12 @@ class IntegerLiteralExpr : public NumberLiteralExpr {
 };
 
 /// FloatLiteralExpr - Floating point literal, like '4.0'.  After semantic
-/// analysis assigns types, this is guaranteed to only have a
+/// analysis assigns types, BuiltinTy 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)
@@ -870,6 +873,9 @@ 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/swift-5.1-old-llvm-branch/include/swift/SIL/OptimizationRemark.h

@@ -50,8 +50,7 @@ struct Argument {
   Argument(StringRef Key, unsigned long long N);
 
   Argument(StringRef Key, SILFunction *F);
-  Argument(StringRef Key, SILType Ty);
-  Argument(StringRef Key, CanType Ty);
+  Argument(StringRef Key, SILType *Ty);
 };
 
 /// Shorthand to insert named-value pairs.

branches/swift-5.1-old-llvm-branch/include/swift/SIL/SILBuilder.h

@@ -918,10 +918,8 @@ class SILBuilder {
   } \
   Copy##Name##ValueInst *createCopy##Name##Value(SILLocation Loc, \
                                                  SILValue operand) { \
-    auto type = getFunction().getLoweredType( \
-      operand->getType().getASTType().getReferenceStorageReferent()); \
     return insert(new (getModule()) \
-      Copy##Name##ValueInst(getSILDebugLocation(Loc), operand, type)); \
+      Copy##Name##ValueInst(getSILDebugLocation(Loc), operand, getModule())); \
   }
 #define SOMETIMES_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
   NEVER_LOADABLE_CHECKED_REF_STORAGE(Name, "...") \

branches/swift-5.1-old-llvm-branch/include/swift/SIL/SILFunction.h

@@ -38,11 +38,6 @@ class SILModule;
 class SILFunctionBuilder;
 class SILProfiler;
 
-namespace Lowering {
-class TypeLowering;
-class AbstractionPattern;
-}
-
 enum IsBare_t { IsNotBare, IsBare };
 enum IsTransparent_t { IsNotTransparent, IsTransparent };
 enum Inline_t { InlineDefault, NoInline, AlwaysInline };
@@ -469,19 +464,6 @@ class SILFunction
             : ResilienceExpansion::Maximal);
   }
 
-  const Lowering::TypeLowering &
-  getTypeLowering(Lowering::AbstractionPattern orig, Type subst);
-
-  const Lowering::TypeLowering &getTypeLowering(Type t) const;
-
-  SILType getLoweredType(Lowering::AbstractionPattern orig, Type subst) const;
-
-  SILType getLoweredType(Type t) const;
-
-  SILType getLoweredLoadableType(Type t) const;
-
-  const Lowering::TypeLowering &getTypeLowering(SILType type) const;
-
   /// Returns true if this function has a calling convention that has a self
   /// argument.
   bool hasSelfParam() const {

branches/swift-5.1-old-llvm-branch/include/swift/SIL/SILInstruction.h

@@ -3929,26 +3929,30 @@ class StoreReferenceInstBase : public InstructionBase<K, NonValueInstruction> {
 /// \param loc The location of the expression that caused the load.
 /// \param lvalue The SILValue representing the address to
 ///        use for the load.
-#define NEVER_OR_SOMETIMES_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
+#define NEVER_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
 class Load##Name##Inst \
     : public LoadReferenceInstBase<SILInstructionKind::Load##Name##Inst> { \
   friend SILBuilder; \
   Load##Name##Inst(SILDebugLocation loc, SILValue lvalue, IsTake_t isTake) \
     : LoadReferenceInstBase(loc, lvalue, isTake) {} \
 };
+#define SOMETIMES_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
+  NEVER_LOADABLE_CHECKED_REF_STORAGE(Name, "...")
 #include "swift/AST/ReferenceStorage.def"
 
 /// Represents a store to a dynamic reference storage memory location.
 /// This is only required for address-only scenarios; for loadable
 /// references, it's better to use a ref_to_##name and a store.
-#define NEVER_OR_SOMETIMES_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
+#define NEVER_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
 class Store##Name##Inst \
     : public StoreReferenceInstBase<SILInstructionKind::Store##Name##Inst> { \
   friend SILBuilder; \
   Store##Name##Inst(SILDebugLocation loc, SILValue src, SILValue dest, \
                 IsInitialization_t isInit) \
     : StoreReferenceInstBase(loc, src, dest, isInit) {} \
 };
+#define SOMETIMES_LOADABLE_CHECKED_REF_STORAGE(Name, ...) \
+  NEVER_LOADABLE_CHECKED_REF_STORAGE(Name, "...")
 #include "swift/AST/ReferenceStorage.def"
 
 /// CopyAddrInst - Represents a copy from one memory location to another. This
@@ -6328,8 +6332,9 @@ class Copy##Name##ValueInst \
                                   SingleValueInstruction> { \
   friend class SILBuilder; \
   Copy##Name##ValueInst(SILDebugLocation DebugLoc, SILValue operand, \
-                        SILType type) \
-      : UnaryInstructionBase(DebugLoc, operand, type) {} \
+                       SILModule &M) \
+      : UnaryInstructionBase(DebugLoc, operand, \
+                             operand->getType().getReferentType(M)) {} \
 };
 #include "swift/AST/ReferenceStorage.def"
 

branches/swift-5.1-old-llvm-branch/include/swift/SIL/SILModule.h

@@ -598,10 +598,7 @@ class SILModule {
 
   /// Can value operations (copies and destroys) on the given lowered type
   /// be performed in this module?
-  // FIXME: Expansion
-  bool isTypeABIAccessible(SILType type,
-                           ResilienceExpansion forExpansion
-                             = ResilienceExpansion::Minimal);
+  bool isTypeABIAccessible(SILType type);
 
   /// Can type metadata for the given formal type be fetched in
   /// the given module?

branches/swift-5.1-old-llvm-branch/include/swift/SIL/SILType.h

@@ -477,6 +477,12 @@ class SILType {
   /// representation. Class existentials do not always qualify.
   bool isHeapObjectReferenceType() const;
 
+  /// Return the SILType corresponding to the underlying type of the given
+  /// metatype type.
+  ///
+  /// *NOTE* Only call on SILTypes for metatype types.
+  SILType getMetatypeInstanceType(SILModule& M) const;
+
   /// Returns true if this SILType is an aggregate that contains \p Ty
   bool aggregateContainsRecord(SILType Ty, SILModule &SILMod) const;
 
@@ -495,6 +501,10 @@ class SILType {
 
   /// Returns true if this is the AnyObject SILType;
   bool isAnyObject() const { return getASTType()->isAnyObject(); }
+
+  /// Returns the underlying referent SILType of an @sil_unowned or @sil_weak
+  /// Type.
+  SILType getReferentType(SILModule &M) const;
 
   /// Returns a SILType with any archetypes mapped out of context.
   SILType mapTypeOutOfContext() const;