[embedded] Change empty ';' into a return, reformat and expand tests

Author: kubamracek

lib/Sema/TypeCheckAttr.cpp

@@ -2109,8 +2109,9 @@ void AttributeChecker::visitSectionAttr(SectionAttr *attr) {
     diagnose(attr->getLocation(), diag::section_empty_name);
 
   if (D->getDeclContext()->isLocalContext())
-    ; // Already diagnosed in Parse, don't diagnose again
-  else if (D->getDeclContext()->isGenericContext())
+    return; // already diagnosed
+
+  if (D->getDeclContext()->isGenericContext())
     diagnose(attr->getLocation(), diag::attr_only_at_non_generic_scope,
              attr->getAttrName());
   else if (auto *VarD = dyn_cast<VarDecl>(D)) {

test/IRGen/section_errors.swift

@@ -2,30 +2,33 @@
 
 // REQUIRES: swift_in_compiler
 
-@_used @_section("__TEXT,__mysection") var g0: Int = 1
+@_used @_section("__TEXT,__mysection") var g0: Int = 1 // ok
 
 struct MyStruct {
-	@_used @_section("__TEXT,__mysection") static var static0: Int = 1
+  @_used @_section("__TEXT,__mysection") static var static0: Int = 1 // ok
 }
 
 struct MyStruct2 {
-	@_section("__TEXT,__mysection") var member0: Int = 1 // expected-error {{properties with attribute '_section' must be static}}
+  @_section("__TEXT,__mysection") var member0: Int = 1 // expected-error {{properties with attribute '_section' must be static}}
 
-	@_section("__TEXT,__mysection") static var member0: Int { return 1 } // expected-error {{'@_section' must not be used on computed properties}}
+  @_section("__TEXT,__mysection") static var static1: Int { return 1 } // expected-error {{'@_section' must not be used on computed properties}}
 }
 
 struct MyStruct3<T> {
-	static var member0: Int = 1 // expected-error {{static stored properties not supported in generic types}}
+  static var member1: Int = 1 // expected-error {{static stored properties not supported in generic types}}
 
-	@_section("__TEXT,__mysection") func foo() {} // expected-error {{attribute '_section' cannot be used in a generic context}}
+  @_section("__TEXT,__mysection") func foo() {} // expected-error {{attribute '_section' cannot be used in a generic context}}
 }
 
 struct MyStruct4<T> {
-	struct InnerStruct {
-		static var member0: Int = 1 // expected-error {{static stored properties not supported in generic types}}
+  struct InnerStruct {
+    static var member2: Int = 1 // expected-error {{static stored properties not supported in generic types}}
 
-		@_section("__TEXT,__mysection") func foo() {} // expected-error {{attribute '_section' cannot be used in a generic context}}
-	}
+    @_section("__TEXT,__mysection") static var member3: Int = 1 // expected-error {{static stored properties not supported in generic types}}
+    // expected-error@-1 {{attribute '_section' cannot be used in a generic context}}
+
+    @_section("__TEXT,__mysection") func foo() {} // expected-error {{attribute '_section' cannot be used in a generic context}}
+  }
 }
 
 @_section("__TEXT,__mysection") // expected-error {{'@_section' attribute cannot be applied to this declaration}}
@@ -34,11 +37,30 @@ struct SomeStruct {}
 @_section("") var g1: Int = 1 // expected-error {{@_section section name cannot be empty}}
 
 func function() {
-	@_section("__TEXT,__mysection") var l0: Int = 1 // expected-error {{attribute '_section' can only be used in a non-local scope}}
-	l0 += 1
-	_ = l0
+  @_section("__TEXT,__mysection") var l0: Int = 1 // expected-error {{attribute '_section' can only be used in a non-local scope}}
+  l0 += 1
+  _ = l0
+
+  @_used var l1: Int = 1 // expected-error {{attribute '_used' can only be used in a non-local scope}}
+  l1 += 1
+  _ = l1
+}
+
+func function_with_type() {
+  class MyClass {
+    @_section("__TEXT,__mysection") static var member: Int = 1 // ok
+  }
+
+  do {
+    class MyClass {
+      @_section("__TEXT,__mysection") static var member: Int = 1 // ok
+    }
+  }
+}
 
-	@_used var l1: Int = 1 // expected-error {{attribute '_used' can only be used in a non-local scope}}
-	l1 += 1
-	_ = l1
+func function_with_type_generic<T>() -> T {
+  class MyClass { // expected-error {{type 'MyClass' cannot be nested in generic function}}
+    @_section("__TEXT,__mysection") static var member: Int = 1 // expected-error {{static stored properties not supported in generic types}}
+    // expected-error@-1 {{attribute '_section' cannot be used in a generic context}}
+  }
 }