Merge pull request #4929 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

CMakeLists.txt

@@ -404,8 +404,6 @@ set(SWIFT_ANDROID_API_LEVEL "" CACHE STRING
 
 set(SWIFT_ANDROID_NDK_PATH "" CACHE STRING
   "Path to the directory that contains the Android NDK tools that are executable on the build machine")
-set(SWIFT_ANDROID_NDK_CLANG_VERSION "12.0.9" CACHE STRING
-  "The Clang version to use when building for Android.")
 set(SWIFT_ANDROID_DEPLOY_DEVICE_PATH "" CACHE STRING
   "Path on an Android device where build products will be pushed. These are used when running the test suite against the device")
 

cmake/caches/Runtime-Android-aarch64.cmake

@@ -23,5 +23,3 @@ set(SWIFT_SDK_ANDROID_ARCHITECTURES aarch64 CACHE STRING "")
 
 # NOTE(compnerd) this is lollipop, which seems to still have decent usage.
 set(SWIFT_ANDROID_API_LEVEL 21 CACHE STRING "")
-# NOTE(compnerd) this matches the value from the NDK r24.
-set(SWIFT_ANDROID_NDK_CLANG_VERSION 14.0.1 CACHE STRING "" FORCE)

cmake/caches/Runtime-Android-armv7.cmake

@@ -23,6 +23,3 @@ set(SWIFT_SDK_ANDROID_ARCHITECTURES armv7 CACHE STRING "")
 
 # NOTE(compnerd) this is lollipop, which seems to still have decent usage.
 set(SWIFT_ANDROID_API_LEVEL 21 CACHE STRING "")
-# NOTE(compnerd) this matches the value from the NDK r24.
-set(SWIFT_ANDROID_NDK_CLANG_VERSION 14.0.1 CACHE STRING "" FORCE)
-

docs/Android.md

@@ -36,7 +36,7 @@ To follow along with this guide, you'll need:
    instructions in the Swift project README.
 2. The latest build of the Swift compiler for your Linux distro, available at
    https://www.swift.org/download/ or sometimes your distro package manager.
-3. The latest version of the Android LTS NDK (r23c at the time of this writing),
+3. The latest version of the Android LTS NDK (r25b at the time of this writing),
    available to download here:
    https://developer.android.com/ndk/downloads
 4. An Android device with remote debugging enabled or the emulator. We require
@@ -54,7 +54,7 @@ and the prebuilt Swift toolchain (add --skip-early-swift-driver if you already
 have a Swift toolchain in your path):
 
 ```
-$ NDK_PATH=path/to/android-ndk-r23c
+$ NDK_PATH=path/to/android-ndk-r25b
 $ SWIFT_PATH=path/to/swift-DEVELOPMENT-SNAPSHOT-2022-05-31-a-ubuntu20.04/usr/bin
 $ git checkout swift-DEVELOPMENT-SNAPSHOT-2022-05-31-a
 $ utils/build-script \
@@ -83,7 +83,7 @@ Then use the standalone Swift stdlib from the previous step to compile a Swift
 source file, targeting Android:
 
 ```
-$ NDK_PATH="path/to/android-ndk-r23c"
+$ NDK_PATH="path/to/android-ndk-r25b"
 $ SWIFT_PATH=path/to/swift-DEVELOPMENT-SNAPSHOT-2022-05-31-a-ubuntu20.04/usr/bin
 $ $SWIFT_PATH/swiftc \                                               # The prebuilt Swift compiler you downloaded
                                                                      # The location of the tools used to build Android binaries
@@ -133,7 +133,7 @@ $ adb push build/Ninja-ReleaseAssert/swift-linux-x86_64/lib/swift/android/libBlo
 In addition, you'll also need to copy the Android NDK's libc++:
 
 ```
-$ adb push /path/to/android-ndk-r23c/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so /data/local/tmp
+$ adb push /path/to/android-ndk-r25b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so /data/local/tmp
 ```
 
 Finally, you'll need to copy the `hello` executable you built in the
@@ -176,7 +176,7 @@ $ utils/build-script \
   -R \                               # Build in ReleaseAssert mode.
   -T \                               # Run all tests, including on the Android device (add --host-test to only run Android tests on the Linux host).
   --android \                        # Build for Android.
-  --android-ndk ~/android-ndk-r23c \  # Path to an Android NDK.
+  --android-ndk ~/android-ndk-r25b \  # Path to an Android NDK.
   --android-arch aarch64 \           # Optionally specify Android architecture, alternately armv7
   --android-api-level 21
 ```

lib/IRGen/GenStruct.cpp

@@ -354,37 +354,6 @@ namespace {
       }
     }
 
-    template <class Fn>
-    void forEachNonEmptyBaseTypeInfo(Fn fn) const {
-      forEachNonEmptyBase([&](clang::QualType, clang::CharUnits,
-                              clang::CharUnits size) {
-        auto &typeInfo = IGM.getOpaqueStorageTypeInfo(Size(size.getQuantity()),
-                                                      Alignment(1));
-        fn(typeInfo);
-      });
-    }
-
-    template <class Fn>
-    void forEachNonEmptyBaseTypeInfoAndBaseAddress(IRGenFunction &IGF,
-                                                   Address addr, Fn fn) const {
-      forEachNonEmptyBase([&](clang::QualType,
-                              clang::CharUnits offset, clang::CharUnits size) {
-        auto &typeInfo = IGM.getOpaqueStorageTypeInfo(Size(size.getQuantity()),
-                                                      Alignment(1));
-
-        Address baseAddr = addr;
-        if (offset.getQuantity() != 0) {
-          auto baseAddrVal =
-              IGF.Builder.CreateBitCast(addr.getAddress(), IGF.IGM.Int8PtrTy);
-          baseAddrVal = IGF.Builder.CreateConstGEP1_64(
-              IGF.IGM.Int8Ty, baseAddrVal, offset.getQuantity());
-          baseAddr = Address(baseAddrVal, Alignment(1));
-        }
-
-        fn(typeInfo, baseAddr);
-      });
-    }
-
   public:
     LoadableClangRecordTypeInfo(ArrayRef<ClangFieldInfo> fields,
                                 unsigned explosionSize, IRGenModule &IGM,
@@ -437,106 +406,6 @@ namespace {
       lowering.addTypedData(ClangDecl, offset.asCharUnits());
     }
 
-    void getSchema(ExplosionSchema &schema) const override {
-      forEachNonEmptyBaseTypeInfo([&](const LoadableTypeInfo &typeInfo) {
-        typeInfo.getSchema(schema);
-      });
-
-      for (auto &field : getFields()) {
-        field.getTypeInfo().getSchema(schema);
-      }
-    }
-
-    void projectFieldFromExplosion(IRGenFunction &IGF, Explosion &in,
-                                   VarDecl *field,
-                                   Explosion &out) const override {
-      auto &fieldInfo = getFieldInfo(field);
-
-      // If the field requires no storage, there's nothing to do.
-      if (fieldInfo.isEmpty())
-        return;
-
-      unsigned baseOffset = 0;
-      if (auto cxxRecord = dyn_cast<clang::CXXRecordDecl>(ClangDecl)) {
-        baseOffset = llvm::count_if(cxxRecord->bases(), [](auto base) {
-          auto baseType = base.getType().getCanonicalType();
-
-          auto baseRecord = cast<clang::RecordType>(baseType)->getDecl();
-          auto baseCxxRecord = cast<clang::CXXRecordDecl>(baseRecord);
-
-          return !baseCxxRecord->isEmpty();
-        });
-      }
-
-      // Otherwise, project from the base.
-      auto fieldRange = fieldInfo.getProjectionRange();
-      auto elements = in.getRange(fieldRange.first + baseOffset,
-                                  fieldRange.second + baseOffset);
-      out.add(elements);
-    }
-
-    void reexplode(IRGenFunction &IGF, Explosion &src,
-                   Explosion &dest) const override {
-      forEachNonEmptyBaseTypeInfo([&](const LoadableTypeInfo &typeInfo) {
-        typeInfo.reexplode(IGF, src, dest);
-      });
-
-      for (auto &field : getFields()) {
-        cast<LoadableTypeInfo>(field.getTypeInfo()).reexplode(IGF, src, dest);
-      }
-    }
-
-    void initialize(IRGenFunction &IGF, Explosion &e, Address addr,
-                    bool isOutlined) const override {
-      forEachNonEmptyBaseTypeInfoAndBaseAddress(
-          IGF, addr, [&](const LoadableTypeInfo &typeInfo, Address baseAddr) {
-            typeInfo.initialize(IGF, e, baseAddr, isOutlined);
-          });
-
-      for (auto &field : getFields()) {
-        if (field.isEmpty())
-          continue;
-
-        Address fieldAddr = field.projectAddress(IGF, addr, None);
-        cast<LoadableTypeInfo>(field.getTypeInfo())
-            .initialize(IGF, e, fieldAddr, isOutlined);
-      }
-    }
-
-    void loadAsTake(IRGenFunction &IGF, Address addr,
-                    Explosion &e) const override {
-      forEachNonEmptyBaseTypeInfoAndBaseAddress(
-          IGF, addr, [&](const LoadableTypeInfo &typeInfo, Address baseAddr) {
-            typeInfo.loadAsTake(IGF, baseAddr, e);
-          });
-
-      for (auto &field : getFields()) {
-        if (field.isEmpty())
-          continue;
-
-        Address fieldAddr = field.projectAddress(IGF, addr, None);
-        cast<LoadableTypeInfo>(field.getTypeInfo())
-            .loadAsTake(IGF, fieldAddr, e);
-      }
-    }
-
-    void loadAsCopy(IRGenFunction &IGF, Address addr,
-                    Explosion &e) const override {
-      forEachNonEmptyBaseTypeInfoAndBaseAddress(
-          IGF, addr, [&](const LoadableTypeInfo &typeInfo, Address baseAddr) {
-            typeInfo.loadAsCopy(IGF, baseAddr, e);
-          });
-
-      for (auto &field : getFields()) {
-        if (field.isEmpty())
-          continue;
-
-        Address fieldAddr = field.projectAddress(IGF, addr, None);
-        cast<LoadableTypeInfo>(field.getTypeInfo())
-            .loadAsCopy(IGF, fieldAddr, e);
-      }
-    }
-
     llvm::NoneType getNonFixedOffsets(IRGenFunction &IGF) const {
       return None;
     }
@@ -1168,6 +1037,7 @@ class ClangRecordLowering {
     if (ClangDecl->isUnion()) {
       collectUnionFields();
     } else {
+      collectBases();
       collectStructFields();
     }
   }
@@ -1195,6 +1065,29 @@ class ClangRecordLowering {
     return (swiftField->getClangNode().castAsDecl() == clangField);
   }
 
+  void collectBases() {
+    auto &layout = ClangDecl->getASTContext().getASTRecordLayout(ClangDecl);
+
+    if (auto cxxRecord = dyn_cast<clang::CXXRecordDecl>(ClangDecl)) {
+      for (auto base : cxxRecord->bases()) {
+        if (base.isVirtual())
+          continue;
+
+        auto baseType = base.getType().getCanonicalType();
+
+        auto baseRecord = cast<clang::RecordType>(baseType)->getDecl();
+        auto baseCxxRecord = cast<clang::CXXRecordDecl>(baseRecord);
+
+        if (baseCxxRecord->isEmpty())
+          continue;
+
+        auto offset = layout.getBaseClassOffset(baseCxxRecord);
+        auto size = ClangDecl->getASTContext().getTypeSizeInChars(baseType);
+        addOpaqueField(Size(offset.getQuantity()), Size(size.getQuantity()));
+      }
+    }
+  }
+
   void collectStructFields() {
     auto cfi = ClangDecl->field_begin(), cfe = ClangDecl->field_end();
     auto swiftProperties = SwiftDecl->getStoredProperties();

lib/PrintAsClang/PrintClangValueType.cpp

@@ -263,12 +263,12 @@ void ClangValueTypePrinter::printValueTypeDecl(
         "*>(other._getOpaquePointer()), metadata._0);\n";
   os << "  }\n";
 
-  // FIXME: the move constructor should be hidden somehow.
-  os << "  inline ";
+  // FIXME: implement the move constructor.
+  os << "  [[noreturn]] inline ";
   printer.printBaseName(typeDecl);
   os << "(";
   printer.printBaseName(typeDecl);
-  os << " &&) = default;\n";
+  os << " &&) { abort(); }\n";
 
   bodyPrinter();
   if (typeDecl->isStdlibDecl())

lib/SIL/IR/SILInstructions.cpp

@@ -169,10 +169,11 @@ SILDebugVariable::createFromAllocation(const AllocationInst *AI) {
   // TODO: Support AllocBoxInst
 
   if (!VarInfo)
-    return VarInfo;
+    return {};
 
-  // Copy everything but the DIExpr
-  VarInfo->DIExpr.clear();
+  // TODO: Support variables with expressions.
+  if (VarInfo->DIExpr)
+    return {};
 
   // Coalesce the debug loc attached on AI into VarInfo
   SILType Type = AI->getType();

lib/SILOptimizer/Transforms/SILSROA.cpp

@@ -213,9 +213,8 @@ createAllocas(llvm::SmallVector<AllocStackInst *, 4> &NewAllocations) {
       Optional<SILDebugVariable> NewDebugVarInfo =
           SILDebugVariable::createFromAllocation(AI);
       if (NewDebugVarInfo)
-        // TODO: Handle DIExpr that is already attached
-        NewDebugVarInfo->DIExpr = SILDebugInfoExpression::createFragment(VD);
-
+        NewDebugVarInfo->DIExpr.append(
+            SILDebugInfoExpression::createFragment(VD));
       NewAllocations.push_back(B.createAllocStack(
           Loc, Type.getFieldType(VD, M, TypeExpansionContext(B.getFunction())),
           NewDebugVarInfo, AI->hasDynamicLifetime(), AI->isLexical()));

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -464,7 +464,8 @@ function(_add_target_variant_link_flags)
     # We need to add the math library, which is linked implicitly by libc++
     list(APPEND result "-lm")
     if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
-      list(APPEND result "-resource-dir=${SWIFT_SDK_ANDROID_ARCH_${LFLAGS_ARCH}_PATH}/../lib64/clang/${SWIFT_ANDROID_NDK_CLANG_VERSION}")
+      file(GLOB RESOURCE_DIR ${SWIFT_SDK_ANDROID_ARCH_${LFLAGS_ARCH}_PATH}/../lib64/clang/*)
+      list(APPEND result "-resource-dir=${RESOURCE_DIR}")
     endif()
 
     # link against the custom C++ library

stdlib/public/Concurrency/CheckedContinuation.swift

@@ -16,7 +16,6 @@ import Swift
 @_silgen_name("swift_continuation_logFailedCheck")
 internal func logFailedCheck(_ message: UnsafeRawPointer)
 
-#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 /// Implementation class that holds the `UnsafeContinuation` instance for
 /// a `CheckedContinuation`.
 @available(SwiftStdlib 5.1, *)
@@ -83,9 +82,7 @@ internal final class CheckedContinuationCanary: @unchecked Sendable {
     }
   }
 }
-#endif
 
-#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 /// A mechanism to interface
 /// between synchronous and asynchronous code,
 /// logging correctness violations.
@@ -299,65 +296,4 @@ public func withCheckedThrowingContinuation<T>(
     body(CheckedContinuation(continuation: $0, function: function))
   }
 }
-#else
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-public struct CheckedContinuation<T, E: Error>: Sendable {
-  @available(SwiftStdlib 5.1, *)
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public init(continuation: UnsafeContinuation<T, E>, function: String = #function) {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
-  
-  @available(SwiftStdlib 5.1, *)
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public func resume(returning value: __owned T) {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
-  
-  @available(SwiftStdlib 5.1, *)
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public func resume(throwing error: __owned E) {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
-}
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-extension CheckedContinuation {
-  @available(SwiftStdlib 5.1, *)
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public func resume<Er: Error>(with result: Result<T, Er>) where E == Error {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
-
-  @available(SwiftStdlib 5.1, *)
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public func resume(with result: Result<T, E>) {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
 
-  @available(SwiftStdlib 5.1, *)
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public func resume() where T == Void {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
-}
-
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-public func withCheckedContinuation<T>(
-    function: String = #function,
-    _ body: (CheckedContinuation<T, Never>) -> Void
-) async -> T {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-public func withCheckedThrowingContinuation<T>(
-    function: String = #function,
-    _ body: (CheckedContinuation<T, Error>) -> Void
-) async throws -> T {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#endif