Fix non instance member tests

Author: Azoy

test/attr/attr_noreturn.swift

@@ -34,7 +34,8 @@ func noReturn3(_: Int)
 // expected-error@-2 {{'@noreturn' has been removed; functions that never return should have a return type of 'Never' instead}}{{1-11=}}{{53-56=Never}}
 
 // Test that error recovery gives us the 'Never' return type
-let x: Never = noReturn1(0) // No error
+let x: Never = noReturn1(0)
+// expected-error@-1 {{constant 'x' cannot have enum type 'Never' with no cases}}
 
 // @noreturn in function type declarations
 let valueNoReturn: @noreturn () -> ()

test/decl/var/properties.swift

@@ -1288,4 +1288,4 @@ var sr8811z: Never {
 
 enum SR8811EmptyGenericEnum<A> {}
 
-let sr8811z: SR8811SR8811EmptyGenericEnum<Int> // expected-error {{constant 'sr8811z' cannot have enum type 'SR8811EmptyGenericEnum<Int>' with no cases}}
+let sr8811z: SR8811EmptyGenericEnum<Int> // expected-error {{constant 'sr8811z' cannot have enum type 'SR8811EmptyGenericEnum<Int>' with no cases}}

test/expr/expressions.swift

@@ -584,9 +584,9 @@ func conversionTest(_ a: inout Double, b: inout Int) {
   var pi_f3 = float.init(getPi()) // expected-error {{ambiguous use of 'init(_:)'}}
   var pi_f4 = float.init(pi_f)
 
-  var e = Empty(f)
+  var e = Empty(f) // expected-error {{variable 'e' cannot have enum type 'Empty' with no cases}}
   var e2 = Empty(d) // expected-error{{cannot convert value of type 'Double' to expected argument type 'Float'}}
-  var e3 = Empty(Float(d))
+  var e3 = Empty(Float(d)) // expected-error {{variable 'e3' cannot have enum type 'Empty' with no cases}}
 }
 
 struct Rule { // expected-note {{'init(target:dependencies:)' declared here}}