Merge pull request #4542 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

CHANGELOG.md

@@ -330,7 +330,7 @@ _**Note:** This is in reverse chronological order, so newer entries are added to
 
 * [SE-0328][]:
 
-  Opaque types (expressed with 'some') can now be used in structural positions
+  Opaque types (expressed with `some`) can now be used in structural positions
   within a result type, including having multiple opaque types in the same
   result. For example:
 
@@ -942,7 +942,7 @@ Swift 5.5
   }
   ```
 
-* The 'lazy' keyword now works in local contexts, making the following valid:
+* The `lazy` keyword now works in local contexts, making the following valid:
 
   ```swift
   func test(useIt: Bool) {
@@ -2901,7 +2901,7 @@ Swift 3.0
 
 * [SE-0101][]:
 
- The functions `sizeof()`, `strideof()`, and `alignof()` have been removed.
+  The functions `sizeof()`, `strideof()`, and `alignof()` have been removed.
   Memory layout properties for a type `T` are now spelled
   `MemoryLayout<T>.size`, `MemoryLayout<T>.stride`, and
   `MemoryLayout<T>.alignment`, respectively.
@@ -2943,7 +2943,7 @@ Swift 3.0
 
 * [SE-0124][]:
 
- Initializers on `Int` and `UInt` that accept an `ObjectIdentifier` must now use an explicit `bitPattern` label.
+  Initializers on `Int` and `UInt` that accept an `ObjectIdentifier` must now use an explicit `bitPattern` label.
 
   ```swift
   let x: ObjectIdentifier = ...
@@ -3199,7 +3199,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
     didFailToRegisterForRemoteNotificationsWithError error: NSError)
   ```
 
- Now it accepts an `Error` argument:
+  Now it accepts an `Error` argument:
 
   ```swift
   optional func application(_ application: UIApplication,
@@ -3422,7 +3422,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
   foo/* comment */! // no longer works
   ```
 
- Parse errors resulting from this change can be resolved by moving the comment outside the expression.
+  Parse errors resulting from this change can be resolved by moving the comment outside the expression.
 
 * [SE-0031][]:
 
@@ -3483,7 +3483,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
   Attributes change from using `=` in parameters lists
   to using `:`, aligning with function call syntax.
 
-  ```
+  ```swift
   // before
   @available(*, unavailable, renamed="MyRenamedProtocol")
 
@@ -3524,13 +3524,13 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
 
   Curried function syntax (with successive parenthesized groups of arguments) is removed, and now produces a compile-time error. Use chained functional return types instead.
 
-```
-// Before
-public func project(function f: FunctionType)(p0: CGPoint, p1: CGPoint)(x: CGFloat) -> CGPoint
+  ```swift
+  // Before
+  public func project(function f: FunctionType)(p0: CGPoint, p1: CGPoint)(x: CGFloat) -> CGPoint
 
-// After
-public func project(function f: FunctionType) -> (p0: CGPoint, p1: CGPoint) -> (x: CGFloat) -> CGPoint
-```
+  // After
+  public func project(function f: FunctionType) -> (p0: CGPoint, p1: CGPoint) -> (x: CGFloat) -> CGPoint
+  ```
 
 * Generic signatures can now contain superclass requirements with generic parameter types, for example:
 
@@ -4877,11 +4877,15 @@ Swift 1.2
 * The `@autoclosure` attribute is now an attribute on a parameter, not an
   attribute on the parameter's type.
 
-  Where before you might have used:
+  Where before you might have used
 
   ```swift
   func assert(predicate : @autoclosure () -> Bool) {...}
-  you now write this as:
+  ```
+
+  you now write this as
+
+  ```swift
   func assert(@autoclosure predicate : () -> Bool) {...}
   ```
 
@@ -4923,7 +4927,11 @@ Swift 1.2
       // redeclares Objective-C method
       //'setProperty:'
   }
+  ```
+
   Similar checking applies to accidental overrides in the Objective-C runtime:
+
+  ```swift
   class B : NSObject {
   func method(arg: String) { }     // note: overridden declaration
       // here has type '(String) -> ()'
@@ -4934,7 +4942,11 @@ Swift 1.2
       // selector 'method:' has incompatible
       // type '([String]) -> ()'
   }
+  ```
+
   as well as protocol conformances:
+
+  ```swift
   class MyDelegate : NSObject, NSURLSessionDelegate {
   func URLSession(session: NSURLSession, didBecomeInvalidWithError:
       Bool){ } // error: Objective-C method 'URLSession:didBecomeInvalidWithError:'
@@ -5022,13 +5034,17 @@ Swift 1.2
   that used `unsafeBitCast` as a workaround for this issue can be written to
   use the raw value initializer.
 
-  For example:
+  For example,
 
   ```swift
   let animationCurve =
     unsafeBitCast(userInfo[UIKeyboardAnimationCurveUserInfoKey].integerValue,
     UIViewAnimationCurve.self)
-  can now be written instead as:
+  ```
+
+  can now be written instead as
+
+  ```swift
   let animationCurve = UIViewAnimationCurve(rawValue:
     userInfo[UIKeyboardAnimationCurveUserInfoKey].integerValue)!
   ```

SwiftCompilerSources/Sources/SIL/BasicBlock.swift

@@ -25,7 +25,7 @@ final public class BasicBlock : ListNode, CustomStringConvertible, HasName {
   public var function: Function { SILBasicBlock_getFunction(bridged).function }
 
   public var description: String {
-    let s = SILBasicBlock_debugDescription(bridged)
+    var s = SILBasicBlock_debugDescription(bridged)
     return String(cString: s.c_str())
   }
 

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -21,7 +21,7 @@ final public class Function : CustomStringConvertible, HasName {
   }
 
   final public var description: String {
-    let s = SILFunction_debugDescription(bridged)
+    var s = SILFunction_debugDescription(bridged)
     return String(cString: s.c_str())
   }
 

SwiftCompilerSources/Sources/SIL/GlobalVariable.swift

@@ -19,7 +19,7 @@ final public class GlobalVariable : CustomStringConvertible, HasName {
   }
 
   public var description: String {
-    let s = SILGlobalVariable_debugDescription(bridged)
+    var s = SILGlobalVariable_debugDescription(bridged)
     return String(cString: s.c_str())
   }
 

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -38,7 +38,7 @@ public class Instruction : ListNode, CustomStringConvertible, Hashable {
   final public var function: Function { block.function }
 
   final public var description: String {
-    let s = SILNode_debugDescription(bridgedNode)
+    var s = SILNode_debugDescription(bridgedNode)
     return String(cString: s.c_str())
   }
 
@@ -136,7 +136,7 @@ public class SingleValueInstruction : Instruction, Value {
 
 public final class MultipleValueInstructionResult : Value {
   final public var description: String {
-    let s = SILNode_debugDescription(bridgedNode)
+    var s = SILNode_debugDescription(bridgedNode)
     return String(cString: s.c_str())
   }
 

SwiftCompilerSources/Sources/SIL/Value.swift

@@ -21,7 +21,7 @@ public protocol Value : AnyObject, CustomStringConvertible {
 
 extension Value {
   public var description: String {
-    let s = SILNode_debugDescription(bridgedNode)
+    var s = SILNode_debugDescription(bridgedNode)
     return String(cString: s.c_str())
   }
 

include/swift/AST/Attr.def

@@ -268,6 +268,7 @@ SIMPLE_DECL_ATTR(objcMembers, ObjCMembers,
   34)
 CONTEXTUAL_SIMPLE_DECL_ATTR(_compilerInitialized, CompilerInitialized,
   OnVar |
+  UserInaccessible |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   35)
 CONTEXTUAL_SIMPLE_DECL_ATTR(__consuming, Consuming,
@@ -727,6 +728,7 @@ DECL_ATTR(_backDeploy, BackDeploy,
 
 CONTEXTUAL_SIMPLE_DECL_ATTR(_local, KnownToBeLocal,
   DeclModifier | OnFunc | OnParam | OnVar |
+  UserInaccessible |
   ABIBreakingToAdd | ABIBreakingToRemove |
   APIBreakingToAdd | APIBreakingToRemove,
   130)

include/swift/AST/DiagnosticsCommon.def

@@ -90,10 +90,6 @@ NOTE(note_typo_candidate,none,
 NOTE(profile_read_error,none,
      "failed to load profile data '%0': '%1'", (StringRef, StringRef))
 
-WARNING(protocol_extension_redundant_requirement,none,
-      "requirement of '%1' to '%2' is redundant in an extension of '%0'",
-      (StringRef, StringRef, StringRef))
-
 ERROR(attr_only_on_parameters, none,
       "'%0' may only be used on parameters", (StringRef))
 

include/swift/AST/DiagnosticsSema.def

@@ -2477,10 +2477,6 @@ ERROR(requires_not_suitable_archetype,none,
       "type %0 in conformance requirement does not refer to a "
       "generic parameter or associated type",
       (Type))
-WARNING(requires_no_same_type_archetype,none,
-        "neither type in same-type constraint (%0 or %1) refers to a "
-        "generic parameter or associated type",
-        (Type, Type))
 
 ERROR(requires_generic_params_made_equal,none,
       "same-type requirement makes generic parameters %0 and %1 equivalent",
@@ -2494,71 +2490,32 @@ ERROR(recursive_generic_signature,none,
       "%0 %1 has self-referential generic requirements", (DescriptiveDeclKind, DeclBaseName))
 ERROR(recursive_generic_signature_extension,none,
       "extension of %0 %1 has self-referential generic requirements", (DescriptiveDeclKind, DeclBaseName))
-ERROR(recursive_same_type_constraint,none,
-      "same-type constraint %0 == %1 is recursive", (Type, Type))
-ERROR(recursive_superclass_constraint,none,
-      "superclass constraint %0 : %1 is recursive", (Type, Type))
-ERROR(requires_generic_param_same_type_does_not_conform,none,
-      "same-type constraint type %0 does not conform to required protocol %1",
-      (Type, Identifier))
-ERROR(same_type_does_not_inherit,none,
-      "same-type constraint type %0 does not inherit from required superclass %1",
-      (Type, Type))
 ERROR(requires_same_concrete_type,none,
       "generic signature requires types %0 and %1 to be the same", (Type, Type))
 WARNING(redundant_conformance_constraint,none,
         "redundant conformance constraint %0 : %1", (Type, ProtocolDecl *))
-NOTE(redundant_conformance_here,none,
-     "conformance constraint %0 : %1 implied here",
-     (Type, ProtocolDecl *))
 
 WARNING(missing_protocol_refinement, none,
         "protocol %0 should be declared to refine %1 due to a same-type constraint on 'Self'",
         (ProtocolDecl *, ProtocolDecl *))
 
-ERROR(same_type_conflict,none,
-      "%select{generic parameter |protocol |}0%1 cannot be equal to both "
-      "%2 and %3", (unsigned, Type, Type, Type))
 ERROR(requirement_conflict,none,
       "no type for %0 can satisfy both %1",
       (Type, StringRef))
 WARNING(redundant_same_type_to_concrete,none,
         "redundant same-type constraint %0 == %1", (Type, Type))
-NOTE(same_type_redundancy_here,none,
-     "same-type constraint %1 == %2 %select{written here|implied here|"
-     "inferred from type here}0",
-     (unsigned, Type, Type))
 ERROR(conflicting_superclass_constraints,none,
       "type %0 cannot be a subclass of both %1 and %2",
       (Type, Type, Type))
-NOTE(conflicting_superclass_constraint,none,
-     "constraint conflicts with %0 : %1",
-     (Type, Type))
 WARNING(redundant_superclass_constraint,none,
         "redundant superclass constraint %0 : %1", (Type, Type))
-NOTE(superclass_redundancy_here,none,
-     "superclass constraint %0 : %1 implied here",
-     (Type, Type))
 
-ERROR(conflicting_layout_constraints,none,
-      "type %0 has conflicting constraints %1 and %2",
-      (Type, LayoutConstraint, LayoutConstraint))
-NOTE(conflicting_layout_constraint, none,
-     "constraint conflicts with %0 : %1",
-     (Type, LayoutConstraint))
 WARNING(redundant_layout_constraint,none,
         "redundant constraint %0 : %1",
         (Type, LayoutConstraint))
-NOTE(previous_layout_constraint, none,
-     "constraint %0 : %1 implied here",
-     (Type, LayoutConstraint))
 
 WARNING(redundant_same_type_constraint,none,
         "redundant same-type constraint %0 == %1", (Type, Type))
-NOTE(previous_same_type_constraint, none,
-     "previous same-type constraint %1 == %2 "
-     "%select{written here|implied here|inferred from type here}0",
-     (unsigned, Type, Type))
 
 WARNING(inherited_associated_type_redecl,none,
         "redeclaration of associated type %0 from protocol %1 is better "