Merge pull request #10837 from gottesmm/semantic_sil_init_block_storage_header

Author: swift-ci

lib/SIL/ValueOwnershipKindClassifier.cpp

@@ -72,7 +72,6 @@ CONSTANT_OWNERSHIP_INST(Trivial, FunctionRef)
 CONSTANT_OWNERSHIP_INST(Trivial, GlobalAddr)
 CONSTANT_OWNERSHIP_INST(Trivial, IndexAddr)
 CONSTANT_OWNERSHIP_INST(Trivial, IndexRawPointer)
-CONSTANT_OWNERSHIP_INST(Trivial, InitBlockStorageHeader)
 CONSTANT_OWNERSHIP_INST(Trivial, InitEnumDataAddr)
 CONSTANT_OWNERSHIP_INST(Trivial, InitExistentialAddr)
 CONSTANT_OWNERSHIP_INST(Trivial, InitExistentialMetatype)
@@ -115,6 +114,7 @@ CONSTANT_OWNERSHIP_INST(Trivial, UnconditionalCheckedCastAddr)
 CONSTANT_OWNERSHIP_INST(Trivial, ValueMetatype)
 CONSTANT_OWNERSHIP_INST(Trivial, WitnessMethod)
 CONSTANT_OWNERSHIP_INST(Trivial, StoreBorrow)
+CONSTANT_OWNERSHIP_INST(Unowned, InitBlockStorageHeader)
 // TODO: It would be great to get rid of these.
 CONSTANT_OWNERSHIP_INST(Unowned, RawPointerToRef)
 CONSTANT_OWNERSHIP_INST(Unowned, RefToUnowned)

test/SIL/ownership-verifier/use_verifier.sil

@@ -357,6 +357,19 @@ bb0:
   return %0 : $Optional<Builtin.NativeObject>
 }
 
+sil @c_function : $@convention(c) (@inout_aliasable @block_storage @callee_owned () -> ()) -> ()
+
+sil @test_block_storage : $@convention(thin) () -> () {
+bb0:
+  %0 = function_ref @c_function : $@convention(c) (@inout_aliasable @block_storage @callee_owned () -> ()) -> ()
+  %1 = alloc_stack $@block_storage @callee_owned () -> ()
+  %2 = project_block_storage %1 : $*@block_storage @callee_owned () -> ()
+  %3 = init_block_storage_header %1 : $*@block_storage @callee_owned () -> (), invoke %0 : $@convention(c) (@inout_aliasable @block_storage @callee_owned () -> ()) -> (), type $@convention(block) () -> ()
+  dealloc_stack %1 : $*@block_storage @callee_owned () -> ()
+  %9999 = tuple()
+  return %9999 : $()
+}
+
 //////////////////////
 // Terminator Tests //
 //////////////////////