---

yaml
---
r: 293751
b: refs/heads/tensorflow
c: e7ef638
h: refs/heads/master
i:
  293749: 7d9e04f
  293747: 52b5f33
  293743: e33d3c1

Author: DougGregor

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 10087ebb99f6026aa72b350040ac82a1887f689c
+refs/heads/tensorflow: e7ef63828503f1247b8ea50ac01e92802f054778
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/benchmark/single-source/ObjectiveCBridging.swift

@@ -73,6 +73,9 @@ public let ObjectiveCBridging = [
   BenchmarkInfo(name: "ObjectiveCBridgeFromNSDateComponents",
     runFunction: run_ObjectiveCBridgeFromNSDateComponents, tags: t,
     setUpFunction: setup_dateComponents),
+  BenchmarkInfo(name: "ObjectiveCBridgeASCIIStringFromFile",
+                runFunction: run_ASCIIStringFromFile, tags: ts,
+                setUpFunction: setup_ASCIIStringFromFile),
 ]
 
 #if _runtime(_ObjC)
@@ -709,3 +712,35 @@ public func run_ObjectiveCBridgeFromNSDateComponents(_ N: Int) {
   }
   #endif
 }
+
+var ASCIIStringFromFile:String? = nil
+public func setup_ASCIIStringFromFile() {
+  #if _runtime(_ObjC)
+  let url:URL
+  if #available(OSX 10.12, iOS 10.0, *) {
+    url = FileManager.default.temporaryDirectory.appendingPathComponent(
+      "sphinx.txt"
+    )
+  } else {
+    url = URL(fileURLWithPath: "/tmp/sphinx.txt")
+  }
+  var str = "Sphinx of black quartz judge my vow"
+  str = Array(repeating: str, count: 100).joined()
+  try? str.write(
+    to: url,
+    atomically: true,
+    encoding: .ascii
+  )
+  ASCIIStringFromFile = try! String(contentsOf: url, encoding: .ascii)
+  #endif
+}
+
+@inline(never)
+public func run_ASCIIStringFromFile(_ N: Int) {
+  #if _runtime(_ObjC)
+  for _ in 0 ..< N {
+    blackHole((ASCIIStringFromFile! + "").utf8.count)
+  }
+  #endif
+}
+

branches/tensorflow/lib/IRGen/GenDecl.cpp

@@ -1082,7 +1082,6 @@ void IRGenerator::emitTypeMetadataRecords() {
 void IRGenerator::emitLazyDefinitions() {
   while (!LazyTypeMetadata.empty() ||
          !LazyTypeContextDescriptors.empty() ||
-         !LazyOpaqueTypeDescriptors.empty() ||
          !LazyFieldDescriptors.empty() ||
          !LazyFunctionDefinitions.empty() ||
          !LazyWitnessTables.empty()) {
@@ -1107,15 +1106,6 @@ void IRGenerator::emitLazyDefinitions() {
       emitLazyTypeContextDescriptor(*IGM.get(), type,
                                     RequireMetadata_t(entry.IsMetadataUsed));
     }
-    while (!LazyOpaqueTypeDescriptors.empty()) {
-      OpaqueTypeDecl *type = LazyOpaqueTypeDescriptors.pop_back_val();
-      auto &entry = LazyOpaqueTypes.find(type)->second;
-      assert(hasLazyMetadata(type));
-      assert(entry.IsDescriptorUsed && !entry.IsDescriptorEmitted);
-      entry.IsDescriptorEmitted = true;
-      CurrentIGMPtr IGM = getGenModule(type->getDeclContext());
-      IGM->emitOpaqueTypeDecl(type);
-    }
     while (!LazyFieldDescriptors.empty()) {
       NominalTypeDecl *type = LazyFieldDescriptors.pop_back_val();
       CurrentIGMPtr IGM = getGenModule(type->getDeclContext());
@@ -1276,10 +1266,7 @@ void IRGenerator::noteUseOfFieldDescriptor(NominalTypeDecl *type) {
 void IRGenerator::noteUseOfOpaqueTypeDescriptor(OpaqueTypeDecl *opaque) {
   if (!opaque)
     return;
-
-  if (!hasLazyMetadata(opaque))
-    return;
-
+  
   auto insertResult = LazyOpaqueTypes.try_emplace(opaque);
   auto &entry = insertResult.first->second;
 

branches/tensorflow/lib/IRGen/IRGenModule.h

@@ -245,7 +245,6 @@ class IRGenerator {
   struct LazyOpaqueInfo {
     bool IsLazy = false;
     bool IsDescriptorUsed = false;
-    bool IsDescriptorEmitted = false;
   };
   /// The set of opaque types enqueued for lazy emission.
   llvm::DenseMap<OpaqueTypeDecl*, LazyOpaqueInfo> LazyOpaqueTypes;

branches/tensorflow/lib/Sema/CodeSynthesis.cpp

@@ -1493,6 +1493,7 @@ static VarDecl *synthesizePropertyDelegateStorageDelegateProperty(
       ctx, property->getCorrectStaticSpelling(), pbdPattern,
       /*init*/nullptr, dc, SourceLoc());
   addMemberToContextIfNeeded(pbd, dc, var);
+  pbd->setStatic(var->isStatic());
 
   // Determine the access level for the property.
   AccessLevel access =
@@ -1575,6 +1576,7 @@ PropertyDelegateBackingPropertyInfoRequest::evaluate(Evaluator &evaluator,
       ctx, backingVar->getCorrectStaticSpelling(), pbdPattern,
       /*init*/nullptr, dc, SourceLoc());
   addMemberToContextIfNeeded(pbd, dc, var);
+  pbd->setStatic(var->isStatic());
 
   // Take the initializer from the original property.
   auto parentPBD = var->getParentPatternBinding();

branches/tensorflow/test/IRGen/lazy_opaque_result_type.swift

@@ -40,6 +40,8 @@ func forceHasMemberwiseInit() {
   _ = HasMemberwiseInit<Int>()
 }
 
+  // CHECK: sil_global hidden @$s18property_delegates9UseStaticV13$staticWibbleAA4LazyOySaySiGGvpZ : $Lazy<Array<Int>>
+
 // HasMemberwiseInit.x.setter
 // CHECK-LABEL: sil hidden [transparent] [ossa] @$s18property_delegates17HasMemberwiseInitV1xSbvs : $@convention(method) <T where T : DefaultInit> (Bool, @inout HasMemberwiseInit<T>) -> () {
 // CHECK: bb0(%0 : $Bool, %1 : $*HasMemberwiseInit<T>):
@@ -250,3 +252,10 @@ func triggerUseLazy() {
   _ = UseLazy(bar: 17)
   _ = UseLazy<Int>(wibble: [1, 2, 3])
 }
+
+struct UseStatic {
+  // CHECK: sil hidden [transparent] [ossa] @$s18property_delegates9UseStaticV12staticWibbleSaySiGvgZ
+  // CHECK: sil hidden [global_init] [ossa] @$s18property_delegates9UseStaticV13$staticWibbleAA4LazyOySaySiGGvau
+  // CHECK: sil hidden [transparent] [ossa] @$s18property_delegates9UseStaticV12staticWibbleSaySiGvsZ
+  @Lazy static var staticWibble = [1, 2, 3]
+}