Merge pull request #34493 from guitard0g/reachable_local_type

Author: swift-ci

lib/SILGen/SILGenStmt.cpp

@@ -326,6 +326,11 @@ void StmtEmitter::visitBraceStmt(BraceStmt *S) {
           // Ignore all other implicit expressions.
           continue;
         }
+      } else if (auto D = ESD.dyn_cast<Decl*>()) {
+        // Local type declarations are not unreachable because they can appear
+        // after the declared type has already been used.
+        if (isa<TypeDecl>(D))
+          continue;
       }
 
       if (StmtType != UnknownStmtType) {

test/SILGen/local_types.swift

@@ -4,7 +4,7 @@
 func function1() {
   return
 
-  class UnreachableClass {} // expected-warning {{code after 'return' will never be executed}}
+  class LocalClass {}
 }
 
 func function2() {
@@ -19,4 +19,4 @@ func function2() {
 
 // CHECK-LABEL: sil private [transparent] [ossa] @$s11local_types9function2yyFyycfU_1SL_V1xSivpfi : $@convention(thin) () -> Int
 
-// CHECK-LABEL: sil_vtable UnreachableClass
+// CHECK-LABEL: sil_vtable LocalClass

test/SILGen/unreachable_code.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil %s -o /dev/null -verify
+// RUN: %target-swift-emit-sil %s -verify | %FileCheck %s
 
 func testUnreachableAfterReturn() -> Int {
   var x: Int = 3
@@ -146,3 +146,12 @@ func testUnreachableCatchClause() {
     print("some error")
   }
 }
+
+func sr13639() -> Int {
+  return Foo.bar
+  struct Foo { // no-warning
+    static var bar = 0
+    // CHECK: sil private @$s16unreachable_code7sr13639SiyF3FooL_V7fooFuncyyF : $@convention(method) (Foo) -> ()
+    func fooFunc() {}
+  }
+}