Merge branch 'release/1.16' into changelog/1.16.2

Author: straight-shoota

.github/workflows/mingw-w64.yml

@@ -59,7 +59,7 @@ jobs:
         shell: msys2 {0}
         working-directory: ./shards
         run: |
-          make install PREFIX="$(pwd)/../crystal"
+          make install PREFIX="$(pwd)/../crystal" SHARDS=false
           # FIXME: remove after crystal-lang/shards#668
           ldd bin/shards.exe | grep -iv ' => /c/windows/system32' | sed 's/.* => //; s/ (.*//' | xargs -t -i /usr/bin/install -m 0755 '{}' "$(pwd)/../crystal/bin/"
 

.github/workflows/win.yml

@@ -23,13 +23,6 @@ jobs:
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
 
-      - name: Set up Cygwin
-        uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559 # v5
-        with:
-          packages: make
-          install-dir: C:\cygwin64
-          add-to-path: false
-
       - name: Download Crystal source
         uses: actions/checkout@v4
 
@@ -48,6 +41,13 @@ jobs:
             libs/yaml.lib
             libs/xml2.lib
           key: win-libs-${{ hashFiles('.github/workflows/win.yml', 'etc/win-ci/*.ps1') }}-msvc
+      - name: Set up Cygwin
+        if: steps.cache-libs.outputs.cache-hit != 'true'
+        uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559 # v5
+        with:
+          packages: make
+          install-dir: C:\cygwin64
+          add-to-path: false
       - name: Build libgc
         if: steps.cache-libs.outputs.cache-hit != 'true'
         run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.8 -AtomicOpsVersion 7.8.2
@@ -102,13 +102,6 @@ jobs:
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
 
-      - name: Set up Cygwin
-        uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559 # v5
-        with:
-          packages: make
-          install-dir: C:\cygwin64
-          add-to-path: false
-
       - name: Download Crystal source
         uses: actions/checkout@v4
 
@@ -136,6 +129,13 @@ jobs:
             dlls/yaml.dll
             dlls/libxml2.dll
           key: win-dlls-${{ hashFiles('.github/workflows/win.yml', 'etc/win-ci/*.ps1') }}-msvc
+      - name: Set up Cygwin
+        if: steps.cache-dlls.outputs.cache-hit != 'true'
+        uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559 # v5
+        with:
+          packages: make
+          install-dir: C:\cygwin64
+          add-to-path: false
       - name: Build libgc
         if: steps.cache-dlls.outputs.cache-hit != 'true'
         run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.8 -AtomicOpsVersion 7.8.2 -Dynamic

etc/win-ci/build-iconv.ps1

@@ -14,6 +14,8 @@ rm libiconv.tar.gz
 
 Run-InDirectory $BuildTree {
     $env:CHERE_INVOKING = 1
+    [System.IO.File]::WriteAllText("src\Makefile.in", [System.IO.File]::ReadAllText("src\Makefile.in").Replace("chmod 777 .", "true"))
+
     & 'C:\cygwin64\bin\bash.exe' --login "$PSScriptRoot\cygwin-build-iconv.sh" "$Version" "$(if ($Dynamic) { 1 })"
     if (-not $?) {
         Write-Host "Error: Failed to build libiconv" -ForegroundColor Red

spec/compiler/semantic/reference_storage_spec.cr

@@ -69,4 +69,14 @@ describe "Semantic: ReferenceStorage" do
       MyRef(Foo).new.u
       CRYSTAL
   end
+
+  it "adds ReferenceStorage to Value.subclasses once (#15677)" do
+    assert_type(<<-CRYSTAL) { bool }
+      @[Primitive(:ReferenceStorageType)]
+      struct ReferenceStorage(T) < Value
+      end
+
+      {{ Value.subclasses.select(&.<=(ReferenceStorage)).size == 1 ? true : nil }}
+      CRYSTAL
+  end
 end

spec/std/humanize_spec.cr

@@ -301,6 +301,7 @@ describe Int do
     it { assert_prints 1099511627776.humanize_bytes(format: Int::BinaryPrefixFormat::JEDEC), "1.0TB" }
     it { assert_prints 1125899906842624.humanize_bytes(format: Int::BinaryPrefixFormat::JEDEC), "1.0PB" }
     it { assert_prints 1152921504606846976.humanize_bytes(format: Int::BinaryPrefixFormat::JEDEC), "1.0EB" }
+    it { assert_prints 1.humanize_bytes(format: Int::BinaryPrefixFormat::JEDEC, unit_separator: '\u2009'), "1\u2009B" }
     it { assert_prints 1152921504606846976.humanize_bytes(format: Int::BinaryPrefixFormat::JEDEC, unit_separator: '\u2009'), "1.0\u2009EB" }
 
     it { assert_prints 1024.humanize_bytes(format: Int::BinaryPrefixFormat::IEC), "1.0kiB" }

src/compiler/crystal/codegen/codegen.cr

@@ -7,15 +7,16 @@ require "./llvm_builder_helper"
 require "./abi/*"
 
 module Crystal
-  MAIN_NAME           = "__crystal_main"
-  RAISE_NAME          = "__crystal_raise"
-  RAISE_OVERFLOW_NAME = "__crystal_raise_overflow"
-  MALLOC_NAME         = "__crystal_malloc64"
-  MALLOC_ATOMIC_NAME  = "__crystal_malloc_atomic64"
-  REALLOC_NAME        = "__crystal_realloc64"
-  GET_EXCEPTION_NAME  = "__crystal_get_exception"
-  ONCE_INIT           = "__crystal_once_init"
-  ONCE                = "__crystal_once"
+  MAIN_NAME              = "__crystal_main"
+  RAISE_NAME             = "__crystal_raise"
+  RAISE_OVERFLOW_NAME    = "__crystal_raise_overflow"
+  RAISE_CAST_FAILED_NAME = "__crystal_raise_cast_failed"
+  MALLOC_NAME            = "__crystal_malloc64"
+  MALLOC_ATOMIC_NAME     = "__crystal_malloc_atomic64"
+  REALLOC_NAME           = "__crystal_realloc64"
+  GET_EXCEPTION_NAME     = "__crystal_get_exception"
+  ONCE_INIT              = "__crystal_once_init"
+  ONCE                   = "__crystal_once"
 
   class Program
     def run(code, filename : String? = nil, debug = Debug::Default)
@@ -265,6 +266,7 @@ module Crystal
     @malloc_atomic_fun : LLVMTypedFunction?
     @realloc_fun : LLVMTypedFunction?
     @raise_overflow_fun : LLVMTypedFunction?
+    @raise_cast_failed_fun : LLVMTypedFunction?
     @c_malloc_fun : LLVMTypedFunction?
     @c_realloc_fun : LLVMTypedFunction?
 
@@ -470,7 +472,7 @@ module Crystal
         case node.name
         when MALLOC_NAME, MALLOC_ATOMIC_NAME, REALLOC_NAME, RAISE_NAME,
              @codegen.personality_name, GET_EXCEPTION_NAME, RAISE_OVERFLOW_NAME,
-             ONCE_INIT, ONCE
+             RAISE_CAST_FAILED_NAME, ONCE_INIT, ONCE
           @codegen.accept node
         end
 
@@ -1488,11 +1490,7 @@ module Crystal
           cond cmp, matches_block, doesnt_match_block
 
           position_at_end doesnt_match_block
-
-          temp_var_name = @program.new_temp_var_name
-          context.vars[temp_var_name] = LLVMVar.new(last_value, obj_type, already_loaded: true)
-          accept type_cast_exception_call(obj_type, to_type, node, temp_var_name)
-          context.vars.delete temp_var_name
+          codegen_raise_cast_failed(type_id, to_type, node)
 
           position_at_end matches_block
           @last = downcast last_value, resulting_type, obj_type, true
@@ -1548,28 +1546,6 @@ module Crystal
       false
     end
 
-    def type_cast_exception_call(from_type, to_type, node, var_name)
-      pieces = [
-        StringLiteral.new("Cast from ").at(node),
-        Call.new(Var.new(var_name).at(node), "class").at(node),
-        StringLiteral.new(" to #{to_type} failed").at(node),
-      ] of ASTNode
-
-      if location = node.location
-        pieces << StringLiteral.new(", at #{location.expanded_location}:#{location.line_number}").at(node)
-      end
-
-      ex = Call.new(Path.global("TypeCastError").at(node), "new", StringInterpolation.new(pieces).at(node)).at(node)
-      call = Call.global("raise", ex).at(node)
-      call = @program.normalize(call)
-
-      meta_vars = MetaVars.new
-      meta_vars[var_name] = MetaVar.new(var_name, type: from_type)
-      visitor = MainVisitor.new(@program, meta_vars)
-      @program.visit_main call, visitor: visitor
-      call
-    end
-
     def cant_pass_closure_to_c_exception_call
       @cant_pass_closure_to_c_exception_call ||= begin
         call = Call.global("raise", StringLiteral.new("passing a closure to C is not allowed")).at(UNKNOWN_LOCATION)
@@ -1579,6 +1555,63 @@ module Crystal
       end
     end
 
+    def codegen_raise_cast_failed(type_id, to_type, node)
+      location = node.location
+      set_current_debug_location(location) if location && @debug.line_numbers?
+
+      func = crystal_raise_cast_failed_fun
+      call_args = [
+        cast_to_void_pointer(type_id_to_class_name(type_id)),
+        cast_to_void_pointer(build_string_constant(to_type.to_s)),
+        location ? cast_to_void_pointer(build_string_constant(location.expanded_location.to_s)) : llvm_context.void_pointer.null,
+      ] of LLVM::Value
+
+      if (rescue_block = @rescue_block)
+        invoke_out_block = new_block "invoke_out"
+        invoke func, call_args, invoke_out_block, rescue_block
+        position_at_end invoke_out_block
+      else
+        call func, call_args
+      end
+
+      unreachable
+    end
+
+    def type_id_to_class_name(type_id)
+      fun_name = "~type_id_to_class_name"
+      func = typed_fun?(@main_mod, fun_name) || create_type_id_to_class_name_fun(fun_name)
+      func = check_main_fun fun_name, func
+      call func, type_id
+    end
+
+    # See also: `#create_metaclass_fun`
+    def create_type_id_to_class_name_fun(name)
+      in_main do
+        define_main_function(name, [llvm_context.int32], llvm_type(@program.string)) do |func|
+          set_internal_fun_debug_location(func, name)
+
+          arg = func.params.first
+
+          current_block = insert_block
+
+          cases = {} of LLVM::Value => LLVM::BasicBlock
+          @program.llvm_id.@ids.each do |type, (_, type_id)|
+            block = new_block "type_#{type_id}"
+            cases[int32(type_id)] = block
+            position_at_end block
+            ret build_string_constant(type.to_s)
+          end
+
+          otherwise = new_block "otherwise"
+          position_at_end otherwise
+          unreachable
+
+          position_at_end current_block
+          @builder.switch arg, otherwise, cases
+        end
+      end
+    end
+
     def visit(node : IsA)
       codegen_type_filter node, &.filter_by(node.const.type)
     end
@@ -2315,6 +2348,15 @@ module Crystal
       end
     end
 
+    def crystal_raise_cast_failed_fun
+      @raise_cast_failed_fun ||= typed_fun?(@main_mod, RAISE_CAST_FAILED_NAME)
+      if raise_cast_failed_fun = @raise_cast_failed_fun
+        check_main_fun RAISE_CAST_FAILED_NAME, raise_cast_failed_fun
+      else
+        raise Error.new("Missing __crystal_raise_cast_failed function, either use std-lib's prelude or define it")
+      end
+    end
+
     # Fallbacks to libc malloc and realloc when the expected __crystal_*
     # functions aren't defined (e.g. empty prelude). We only use them in tests
     # that don't require the prelude, so they don't require the GC.

src/compiler/crystal/semantic/top_level_visitor.cr

@@ -120,7 +120,7 @@ class Crystal::TopLevelVisitor < Crystal::SemanticVisitor
         when node.splat_index
           node.raise "BUG: Expected ReferenceStorageType to have no splat parameter"
         end
-        type = GenericReferenceStorageType.new @program, scope, name, @program.value, type_vars
+        type = GenericReferenceStorageType.new @program, scope, name, @program.value, type_vars, false
         type.declare_instance_var("@type_id", @program.int32)
         type.can_be_stored = false
       end

src/crystal/system/win32/file_descriptor.cr

@@ -519,11 +519,11 @@ private module ConsoleUtils
   @@read_requests = Deque(ReadRequest).new
   @@bytes_read = Deque(Int32).new
   @@mtx = ::Thread::Mutex.new
-  {% if flag?(:execution_context) %}
-    @@reader_thread = ::Fiber::ExecutionContext::Isolated.new("READER-LOOP") { reader_loop }
-  {% else %}
-    @@reader_thread = ::Thread.new { reader_loop }
-  {% end %}
+
+  # Start a dedicated thread to block on reads from the console. Doesn't need an
+  # isolated execution context because there's no fiber communication (only
+  # thread communication) and only blocking I/O within the thread.
+  @@reader_thread = ::Thread.new { reader_loop }
 
   private def self.reader_loop
     while true

src/crystal/tracing.cr

@@ -106,7 +106,7 @@ module Crystal
         end
 
         def write(value : Time::Span) : Nil
-          write(value.seconds * Time::NANOSECONDS_PER_SECOND + value.nanoseconds)
+          write(value.seconds &* Time::NANOSECONDS_PER_SECOND &+ value.nanoseconds)
         end
 
         def write(value : Bool) : Nil

src/fiber/execution_context/isolated.cr

@@ -191,9 +191,12 @@ module Fiber::ExecutionContext
     def wait : Nil
       if @running
         node = Fiber::PointerLinkedListNode.new(Fiber.current)
+
         @mutex.synchronize do
           @wait_list.push(pointerof(node)) if @running
         end
+
+        Fiber.suspend
       end
 
       if exception = @exception

src/humanize.cr

@@ -326,17 +326,17 @@ struct Int
   #
   # See `Number#humanize` for more details on the behaviour and arguments.
   def humanize_bytes(io : IO, precision : Int = 3, separator = '.', *, significant : Bool = true, unit_separator = nil, format : BinaryPrefixFormat = :IEC) : Nil
-    humanize(io, precision, separator, nil, base: 1024, significant: significant) do |magnitude|
+    humanize(io, precision, separator, nil, base: 1024, significant: significant, unit_separator: unit_separator) do |magnitude|
       magnitude = Number.prefix_index(magnitude)
 
       prefix = Number.si_prefix(magnitude)
       if prefix.nil?
         unit = "B"
       else
         if format.iec?
-          unit = "#{unit_separator}#{prefix}iB"
+          unit = "#{prefix}iB"
         else
-          unit = "#{unit_separator}#{prefix.upcase}B"
+          unit = "#{prefix.upcase}B"
         end
       end
       {magnitude, unit, magnitude > 0}

src/kernel.cr

@@ -599,6 +599,12 @@ end
 {% end %}
 
 {% unless flag?(:interpreted) || flag?(:wasm32) %}
+  {% if flag?(:execution_context) %}
+    Fiber::ExecutionContext.init_default_context
+  {% else %}
+    Crystal::Scheduler.init
+  {% end %}
+
   # load debug info on start up of the program is executed with CRYSTAL_LOAD_DEBUG_INFO=1
   # this will make debug info available on print_frame that is used by Crystal's segfault handler
   #
@@ -608,12 +614,6 @@ end
   Exception::CallStack.load_debug_info if ENV["CRYSTAL_LOAD_DEBUG_INFO"]? == "1"
   Exception::CallStack.setup_crash_handler
 
-  {% if flag?(:execution_context) %}
-    Fiber::ExecutionContext.init_default_context
-  {% else %}
-    Crystal::Scheduler.init
-  {% end %}
-
   {% if flag?(:win32) %}
     Crystal::System::Process.start_interrupt_loop
   {% else %}

src/raise.cr

@@ -301,4 +301,13 @@ end
   def __crystal_raise_cast_failed(obj, type_name : String, location : String)
     raise TypeCastError.new("Cast from #{obj.class} to #{type_name} failed, at #{location}")
   end
+{% else %}
+  # :nodoc:
+  fun __crystal_raise_cast_failed(from_type : Void*, to_type : Void*, location : Void*) : NoReturn
+    if location
+      raise TypeCastError.new("Cast from #{from_type.as(String)} to #{to_type.as(String)} failed, at #{location.as(String)}")
+    else
+      raise TypeCastError.new("Cast from #{from_type.as(String)} to #{to_type.as(String)} failed")
+    end
+  end
 {% end %}