Merge pull request #4228 from swiftwasm/main

[pull] swiftwasm from main

Author: MaxDesiatov

include/swift/Reflection/ReflectionContext.h

@@ -1157,15 +1157,15 @@ class ReflectionContext
         reinterpret_cast<const ConcurrentHashMap<Runtime> *>(MapBytes.get());
 
     auto Count = MapData->ElementCount;
-    auto Size = Count * sizeof(ConformanceCacheEntry<Runtime>);
+    auto Size = Count * sizeof(ConformanceCacheEntry<Runtime>) + sizeof(StoredPointer);
 
     auto ElementsBytes =
         getReader().readBytes(RemoteAddress(MapData->Elements), Size);
     if (!ElementsBytes)
       return;
     auto ElementsData =
         reinterpret_cast<const ConformanceCacheEntry<Runtime> *>(
-            ElementsBytes.get());
+            reinterpret_cast<const char *>(ElementsBytes.get()) + sizeof(StoredPointer));
 
     for (StoredSize i = 0; i < Count; i++) {
       auto &Element = ElementsData[i];

lib/Sema/TypeCheckStorage.cpp

@@ -257,16 +257,18 @@ PatternBindingEntryRequest::evaluate(Evaluator &eval,
   llvm::SmallVector<VarDecl *, 2> vars;
   binding->getPattern(entryNumber)->collectVariables(vars);
   bool isReq = false;
+  bool shouldRequireStatic = false;
   if (auto *d = binding->getDeclContext()->getAsDecl()) {
     isReq = isa<ProtocolDecl>(d);
+    shouldRequireStatic = isa<NominalTypeDecl>(d);
   }
   for (auto *sv: vars) {
     bool hasConst = sv->getAttrs().getAttribute<CompileTimeConstAttr>();
     if (!hasConst)
       continue;
     bool hasStatic = StaticSpelling != StaticSpellingKind::None;
     // only static _const let/var is supported
-    if (!hasStatic) {
+    if (shouldRequireStatic && !hasStatic) {
       binding->diagnose(diag::require_static_for_const);
       continue;
     }

stdlib/public/Platform/winsdk.modulemap

@@ -411,6 +411,13 @@ module WinSDK [system] {
     link "sensorsapi.lib"
   }
 
+  module ToolHelp {
+    header "TlHelp32.h"
+    export *
+
+    link "kernel32.Lib"
+  }
+
   module UI {
     module XAML {
       module Hosting {

test/Sema/const_pass_as_arguments.swift

@@ -71,3 +71,12 @@ class ConstFanClassWrong4: ConstFan {
 	static func giveMeString() -> String { return "" }
 	static _const let v: String = giveMeString() // expected-error {{_const let should be initialized with a compile-time literal}}
 }
+
+_const let globalConst = 3
+
+class ConstFanClassWrong5 {
+	func foo() -> Int {
+		_const let localConst = 3
+		return globalConst + localConst
+	}
+}

test/stdlib/SIMD.swift

@@ -1,6 +1,7 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
+// UNSUPPORTED: freestanding
 
 import Foundation
 import StdlibUnittest

test/stdlib/SIMDConcreteFP.swift.gyb

@@ -16,6 +16,7 @@
 // RUN: %line-directive %t/SIMDConcreteFP.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
 // REQUIRES: rdar76545659
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 

test/stdlib/SIMDConcreteIntegers.swift.gyb

@@ -15,6 +15,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %line-directive %t/SIMDConcreteIntegers.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 

test/stdlib/SIMDConcreteMasks.swift.gyb

@@ -15,6 +15,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %line-directive %t/SIMDConcreteMasks.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 

utils/build-presets.ini

@@ -2532,6 +2532,7 @@ swift-stdlib-lto=full
 swift-stdlib-enable-prespecialization=0
 swift-stdlib-passthrough-metadata-allocator=1
 swift-stdlib-short-mangling-lookups=0
+swift-stdlib-enable-vector-types=0
 swift-stdlib-experimental-hermetic-seal-at-link=1
 swift-stdlib-disable-instantiation-caches=1
 swift-stdlib-has-type-printing=0

utils/build-script-impl

@@ -222,6 +222,7 @@ KNOWN_SETTINGS=(
     swift-stdlib-enable-prespecialization         ""                "whether stdlib should be built with generic metadata prespecialization enabled, defaults to true on Darwin and Linux, false otherwise"
     swift-stdlib-passthrough-metadata-allocator   "0"               "whether stdlib should be built without a custom implementation of MetadataAllocator, relying on malloc+free instead"
     swift-stdlib-short-mangling-lookups           "1"               "whether to build stdlib with fast-path context descriptor lookups based on well-known short manglings"
+    swift-stdlib-enable-vector-types              "1"               "whether to build stdlib with support for SIMD and vector types"
     swift-stdlib-experimental-hermetic-seal-at-link     "0"         "whether stdlib should be built with -experimental-hermetic-seal-at-link"
     swift-stdlib-disable-instantiation-caches     "0"               "whether to build stdlib with -disable-preallocated-instantiation-caches"
     swift-stdlib-has-type-printing                "1"               "whether stdlib should support printing user-friendly type name as strings at runtime"
@@ -2028,6 +2029,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DSWIFT_STDLIB_ENABLE_LTO:STRING="${SWIFT_STDLIB_LTO}"
                     -DSWIFT_STDLIB_PASSTHROUGH_METADATA_ALLOCATOR:BOOL=$(true_false "${SWIFT_STDLIB_PASSTHROUGH_METADATA_ALLOCATOR}")
                     -DSWIFT_STDLIB_SHORT_MANGLING_LOOKUPS:BOOL=$(true_false "${SWIFT_STDLIB_SHORT_MANGLING_LOOKUPS}")
+                    -DSWIFT_STDLIB_ENABLE_VECTOR_TYPES:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_VECTOR_TYPES}")
                     -DSWIFT_STDLIB_HAS_TYPE_PRINTING:BOOL=$(true_false "${SWIFT_STDLIB_HAS_TYPE_PRINTING}")
                     -DSWIFT_STDLIB_EXPERIMENTAL_HERMETIC_SEAL_AT_LINK:BOOL=$(true_false "${SWIFT_STDLIB_EXPERIMENTAL_HERMETIC_SEAL_AT_LINK}")
                     -DSWIFT_STDLIB_DISABLE_INSTANTIATION_CACHES:BOOL=$(true_false "${SWIFT_STDLIB_DISABLE_INSTANTIATION_CACHES}")