Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

lib/SILGen/SILGenApply.cpp

@@ -3622,8 +3622,8 @@ SILGenFunction::tryEmitAddressableParameterAsAddress(ArgumentSource &&arg,
     auto vd = cast<VarDecl>(memberStorage);
     // TODO: Is it possible and/or useful for class storage to be
     // addressable?
-    if (!vd->getDeclContext()->getInnermostTypeContext()
-         ->getDeclaredTypeInContext()->getStructOrBoundGenericStruct()) {
+    if (!vd->isInstanceMember()
+        || !isa<StructDecl>(vd->getDeclContext())) {
       return notAddressable();
     }
 

lib/SILGen/SILGenDecl.cpp

@@ -684,7 +684,8 @@ static void deallocateAddressable(SILGenFunction &SGF,
                 const SILGenFunction::VarLoc::AddressableBuffer::State &state) {
   SGF.B.createEndBorrow(l, state.storeBorrow);
   SGF.B.createDeallocStack(l, state.allocStack);
-  if (state.reabstraction) {
+  if (state.reabstraction
+      && !state.reabstraction->getType().isTrivial(SGF.F)) {
     SGF.B.createDestroyValue(l, state.reabstraction);
   }
 }

stdlib/public/RuntimeModule/Elf.swift

@@ -1475,6 +1475,11 @@ final class ElfImage<SomeElfTraits: ElfTraits>
       let stringSect = ElfStringSection(source: stringSource)
 
       for shdr in sectionHeaders {
+        // All other fields are undefined for SHT_NULL
+        if shdr.sh_type == .SHT_NULL {
+          continue
+        }
+
         guard let name = stringSect.getStringAt(index: Int(shdr.sh_name)) else {
           continue
         }
@@ -1612,6 +1617,11 @@ final class ElfImage<SomeElfTraits: ElfTraits>
         let stringSect = ElfStringSection(source: stringSource)
 
         for shdr in sectionHeaders {
+          // All other fields are undefined for SHT_NULL
+          if shdr.sh_type == .SHT_NULL {
+            continue
+          }
+
           guard let sname
                   = stringSect.getStringAt(index: Int(shdr.sh_name)) else {
             continue

test/SILGen/82368.swift

@@ -0,0 +1,11 @@
+// RUN: %target-swift-emit-silgen -disable-availability-checking -verify %s
+
+struct A {
+  static let a: InlineArray = [1]
+
+  static func foo() {
+    a.span.withUnsafeBufferPointer({ buffer in
+      print("\(buffer.baseAddress!)")
+    })
+  }
+}

utils/swift_build_support/swift_build_support/products/llvm.py

@@ -141,7 +141,7 @@ def copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain(
                                                      'lib', 'darwin')
                 print('copying compiler-rt embedded builtins from {}'
                       ' into the local clang build directory {}.'.format(
-                          host_cxx_builtins_dir, dest_builtins_dir))
+                          host_cxx_builtins_dir, dest_builtins_dir), flush=True)
 
                 for _os in ['ios', 'watchos', 'tvos', 'xros']:
                     # Copy over the device .a when necessary