---

yaml
---
r: 346061
b: refs/heads/master
c: 250d26c
h: refs/heads/master
i:
  346059: 0854669

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e488da81b3f4275550ed0a48d55dfbf8cfa84f52
+refs/heads/master: 250d26c4e1f56ed72749dd39a67c7ed4423a41d5
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/benchmark/single-source/DictTest4Legacy.swift

@@ -56,6 +56,10 @@ struct LargeKey: Hashable {
     return hash
   }
 
+  func hash(into hasher: inout Hasher) {
+    hasher.combine(self.hashValue)
+  }
+
   init(_ value: Int) {
     self.i = value
     self.j = 2 * value

trunk/test/stdlib/Metal.swift

@@ -259,10 +259,12 @@ if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *){
       let encoder = cmdBuf.makeRenderCommandEncoder(descriptor: rpDesc)!
       encoder.useResources([buf], usage: MTLResourceUsage.read)
       encoder.useHeaps([heap])
-      #if os(macOS)
+#if os(macOS) || os(iOS)
+      if #available(iOS 12.0, macOS 10.13, *) {
         encoder.setViewports([MTLViewport()])
         encoder.setScissorRects([MTLScissorRect(x:0, y:0, width:1, height:1)])
-      #endif
+      }
+#endif
       encoder.setVertexBuffers([buf], offsets: [0], range: 0..<1)
       encoder.setVertexTextures([tex], range: 0..<1)
       encoder.setVertexSamplerStates([smplr], range: 0..<1)