Merge pull request #5425 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

CMakeLists.txt

@@ -614,6 +614,10 @@ option(SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP
   "Enable experimental C++ interop modules"
   FALSE)
 
+option(SWIFT_ENABLE_CXX_INTEROP_SWIFT_BRIDGING_HEADER
+  "Install the <swift/bridging> C++ interoperability header alongside compiler"
+  TRUE)
+
 option(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED
   "Enable experimental distributed actors and functions"
   FALSE)

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -92,6 +92,7 @@ private func registerSwiftPasses() {
   registerPass(addressEscapeInfoDumper, { addressEscapeInfoDumper.run($0) })
   registerPass(accessDumper, { accessDumper.run($0) })
   registerPass(deadEndBlockDumper, { deadEndBlockDumper.run($0) })
+  registerPass(memBehaviorDumper, { memBehaviorDumper.run($0) })
   registerPass(rangeDumper, { rangeDumper.run($0) })
   registerPass(runUnitTests, { runUnitTests.run($0) })
   registerPass(testInstructionIteration, { testInstructionIteration.run($0) })

SwiftCompilerSources/Sources/Optimizer/TestPasses/CMakeLists.txt

@@ -11,6 +11,7 @@ swift_compiler_sources(Optimizer
   AccessDumper.swift
   DeadEndBlockDumper.swift
   EscapeInfoDumper.swift
+  MemBehaviorDumper.swift
   SILPrinter.swift
   RangeDumper.swift
   RunUnitTests.swift

SwiftCompilerSources/Sources/Optimizer/TestPasses/MemBehaviorDumper.swift

@@ -0,0 +1,80 @@
+//===--- MemBehaviorDumper.swift ------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import SIL
+
+/// Prints the memory behavior of relevant instructions in relation to address values of the function.
+let memBehaviorDumper = FunctionPass(name: "dump-mem-behavior") {
+  (function: Function, context: FunctionPassContext) in
+
+  let aliasAnalysis = context.aliasAnalysis
+
+  print("@\(function.name)")
+
+  let values = function.allValues
+
+  var currentPair = 0
+  for inst in function.instructions where inst.shouldTest {
+
+    for value in values where value.definingInstruction != inst {
+
+      if value.type.isAddress || value is AddressToPointerInst {
+        let read = aliasAnalysis.mayRead(inst, fromAddress: value)
+        let write = aliasAnalysis.mayWrite(inst, toAddress: value)
+        print("PAIR #\(currentPair).")
+        print("  \(inst)")
+        print("  \(value)")
+        print("  r=\(read ? 1 : 0),w=\(write ? 1 : 0)")
+        currentPair += 1
+      }
+    }
+  }
+  print()
+}
+
+private extension Function {
+  var allValues: [Value] {
+    var values: [Value] = []
+    for block in blocks {
+      values.append(contentsOf: block.arguments.map { $0 })
+      for inst in block.instructions {
+        values.append(contentsOf: inst.results)
+      }
+    }
+    return values
+  }
+}
+
+private extension Instruction {
+  var shouldTest: Bool {
+    switch self {
+    case is ApplyInst,
+         is TryApplyInst,
+         is EndApplyInst,
+         is BeginApplyInst,
+         is AbortApplyInst,
+         is BeginAccessInst,
+         is EndAccessInst,
+         is EndCOWMutationInst,
+         is CopyValueInst,
+         is DestroyValueInst,
+         is EndBorrowInst,
+         is LoadInst,
+         is StoreInst,
+         is CopyAddrInst,
+         is BuiltinInst:
+      return true
+    default:
+      return false
+    }
+  }
+}

include/swift/AST/DiagnosticsParse.def

@@ -1092,9 +1092,13 @@ NOTE(indent_expression_to_silence,none,
 ERROR(expected_expr_throw,PointsToFirstBadToken,
       "expected expression in 'throw' statement", ())
 
-// Forget Statement
-ERROR(expected_expr_forget,PointsToFirstBadToken,
-      "expected expression in 'forget' statement", ())
+// Discard Statement
+ERROR(expected_expr_discard,PointsToFirstBadToken,
+      "expected expression in 'discard' statement", ())
+WARNING(forget_is_deprecated,PointsToFirstBadToken,
+      "'_forget' keyword is deprecated and will be removed soon; "
+      "use 'discard' instead",
+      ())
 
 // Await/Async
 ERROR(expected_await_not_async,none,

include/swift/AST/DiagnosticsSIL.def

@@ -735,15 +735,15 @@ ERROR(noimplicitcopy_used_on_generic_or_existential, none,
       "@_noImplicitCopy can not be used on a generic or existential typed "
       "binding or a nominal type containing such typed things", ())
 
-// forget statement
-ERROR(forget_nontrivial_storage,none,
-      "can only 'forget' type %0 if it contains trivially-destroyed "
+// discard statement
+ERROR(discard_nontrivial_storage,none,
+      "can only 'discard' type %0 if it contains trivially-destroyed "
       "stored properties at this time",
       (Type))
-NOTE(forget_nontrivial_storage_note,none,
+NOTE(discard_nontrivial_storage_note,none,
       "type %0 cannot be trivially destroyed",
       (Type))
-NOTE(forget_nontrivial_implicit_storage_note,none,
+NOTE(discard_nontrivial_implicit_storage_note,none,
      "type %0 implicitly contains %1 which cannot be trivially destroyed",
      (Type, Type))
 

include/swift/AST/DiagnosticsSema.def

@@ -493,8 +493,8 @@ ERROR(cannot_convert_yield_value_protocol,none,
 ERROR(cannot_convert_yield_value_nil,none,
       "nil is not compatible with expected yield type %0", (Type))
 
-ERROR(cannot_convert_forget_value,none,
-      "cannot convert value of type %0 to expected forget type %1",
+ERROR(cannot_convert_discard_value,none,
+      "cannot convert value of type %0 to expected discard type %1",
       (Type,Type))
 
 ERROR(cannot_convert_closure_result,none,
@@ -4609,30 +4609,30 @@ ERROR(opaque_type_var_no_underlying_type,none,
 
 
 //------------------------------------------------------------------------------
-// MARK: Forget Statement
+// MARK: Discard Statement
 //------------------------------------------------------------------------------
-ERROR(forget_wrong_context_decl,none,
-      "'forget' statement cannot appear in %0",
+ERROR(discard_wrong_context_decl,none,
+      "'discard' statement cannot appear in %0",
       (DescriptiveDeclKind))
-ERROR(forget_no_deinit,none,
-      "'forget' has no effect for type %0 unless it has a deinitializer",
+ERROR(discard_no_deinit,none,
+      "'discard' has no effect for type %0 unless it has a deinitializer",
       (Type))
-ERROR(forget_wrong_context_closure,none,
-      "'forget' statement cannot appear in closure",
+ERROR(discard_wrong_context_closure,none,
+      "'discard' statement cannot appear in closure",
       ())
-ERROR(forget_wrong_context_misc,none,
-      "'forget' statement cannot appear in this context",
+ERROR(discard_wrong_context_misc,none,
+      "'discard' statement cannot appear in this context",
       ())
-ERROR(forget_wrong_context_copyable,none,
-      "'forget' statement can only appear in noncopyable type's member",
+ERROR(discard_wrong_context_copyable,none,
+      "'discard' statement can only appear in noncopyable type's member",
       (DescriptiveDeclKind))
-ERROR(forget_wrong_context_nonconsuming,none,
-      "'forget' statement can only appear in consuming %0",
+ERROR(discard_wrong_context_nonconsuming,none,
+      "'discard' statement can only appear in consuming %0",
       (DescriptiveDeclKind))
-ERROR(forget_wrong_not_self,none,
-      "you can only forget 'self'", ())
-ERROR(forget_wrong_module,none,
-      "can only 'forget' from the same module defining type %0",
+ERROR(discard_wrong_not_self,none,
+      "you can only discard 'self'", ())
+ERROR(discard_wrong_module,none,
+      "can only 'discard' from the same module defining type %0",
       (Type))
 
 //------------------------------------------------------------------------------

include/swift/AST/NameLookup.h

@@ -650,7 +650,7 @@ class FindLocalVal : public StmtVisitor<FindLocalVal> {
   void visitReturnStmt(ReturnStmt *) {}
   void visitYieldStmt(YieldStmt *) {}
   void visitThrowStmt(ThrowStmt *) {}
-  void visitForgetStmt(ForgetStmt *) {}
+  void visitDiscardStmt(DiscardStmt *) {}
   void visitPoundAssertStmt(PoundAssertStmt *) {}
   void visitDeferStmt(DeferStmt *DS) {
     // Nothing in the defer is visible.

include/swift/AST/Stmt.h

@@ -1510,25 +1510,26 @@ class ThrowStmt : public Stmt {
   }
 };
 
-/// ForgetStmt - Consumes a noncopyable value and performs memberwise
+/// DiscardStmt - Consumes a noncopyable value and performs memberwise
 /// destruction of unconsumed fields, without invoking its deinit. Only
-/// supported form is "forget self".
-class ForgetStmt : public Stmt {
+/// supported form is "discard self".
+class DiscardStmt : public Stmt {
   Expr *SubExpr;
-  SourceLoc ForgetLoc;
+  SourceLoc DiscardLoc;
   AbstractFunctionDecl *InnermostMethod;
 
 public:
-  explicit ForgetStmt(SourceLoc forgetLoc, Expr *subExpr)
-      : Stmt(StmtKind::Forget, /*Implicit=*/false),
-        SubExpr(subExpr), ForgetLoc(forgetLoc), InnermostMethod(nullptr) {}
+  explicit DiscardStmt(SourceLoc discardLoc, Expr *subExpr)
+      : Stmt(StmtKind::Discard, /*Implicit=*/false),
+        SubExpr(subExpr), DiscardLoc(discardLoc), InnermostMethod(nullptr) {}
 
-  SourceLoc getForgetLoc() const { return ForgetLoc; }
+  /// Location of the 'discard' keyword.
+  SourceLoc getDiscardLoc() const { return DiscardLoc; }
 
-  SourceLoc getStartLoc() const { return ForgetLoc; }
+  SourceLoc getStartLoc() const { return DiscardLoc; }
   SourceLoc getEndLoc() const;
   SourceRange getSourceRange() const {
-    return SourceRange(ForgetLoc, getEndLoc());
+    return SourceRange(DiscardLoc, getEndLoc());
   }
 
   Expr *getSubExpr() const { return SubExpr; }
@@ -1544,7 +1545,7 @@ class ForgetStmt : public Stmt {
   }
 
   static bool classof(const Stmt *S) {
-    return S->getKind() == StmtKind::Forget;
+    return S->getKind() == StmtKind::Discard;
   }
 };
 

include/swift/AST/StmtNodes.def

@@ -66,7 +66,7 @@ STMT(Continue, Stmt)
 STMT(Fallthrough, Stmt)
 STMT(Fail, Stmt)
 STMT(Throw, Stmt)
-STMT(Forget, Stmt)
+STMT(Discard, Stmt)
 STMT(PoundAssert, Stmt)
 LAST_STMT(PoundAssert)