more gcc-15 array initializer fixes

Author: perazz

src/fpm_compile_commands.F90

@@ -58,6 +58,12 @@ module fpm_compile_commands
     interface compile_command_t
         module procedure cct_new
     end interface compile_command_t
+
+    !> Add compile commands to array (gcc-15 bug workaround)
+    interface add_compile_command
+        module procedure add_compile_command_one
+        module procedure add_compile_command_many
+    end interface add_compile_command
 
     contains
 
@@ -330,7 +336,7 @@ pure subroutine cct_register_object(self, command, error)
         type(error_t), allocatable, intent(out) :: error    
 
         if (allocated(self%command)) then         
-           self%command = [self%command, command]
+           call add_compile_command(self%command, command)
         else
            allocate(self%command(1), source=command) 
         end if        
@@ -442,6 +448,57 @@ logical function cct_is_same(this,that)
         !> All checks passed!
         cct_is_same = .true.
 
-    end function cct_is_same        
-    
+    end function cct_is_same
+
+    !> Add one compile command to array with a loop (gcc-15 bug on array initializer)
+    pure subroutine add_compile_command_one(list,new)
+        type(compile_command_t), allocatable, intent(inout) :: list(:)
+        type(compile_command_t), intent(in) :: new
+
+        integer :: i,n
+        type(compile_command_t), allocatable :: tmp(:)
+
+        if (allocated(list)) then
+           n = size(list)
+        else
+           n = 0
+        end if
+
+        allocate(tmp(n+1))
+        do i=1,n
+           tmp(i) = list(i)
+        end do
+        tmp(n+1) = new
+        call move_alloc(from=tmp,to=list)
+
+    end subroutine add_compile_command_one
+
+    !> Add multiple compile commands to array with a loop (gcc-15 bug on array initializer)
+    pure subroutine add_compile_command_many(list,new)
+        type(compile_command_t), allocatable, intent(inout) :: list(:)
+        type(compile_command_t), intent(in) :: new(:)
+
+        integer :: i,n,add
+        type(compile_command_t), allocatable :: tmp(:)
+
+        if (allocated(list)) then
+           n = size(list)
+        else
+           n = 0
+        end if
+
+        add = size(new)
+        if (add == 0) return
+
+        allocate(tmp(n+add))
+        do i=1,n
+           tmp(i) = list(i)
+        end do
+        do i=1,add
+           tmp(n+i) = new(i)
+        end do
+        call move_alloc(from=tmp,to=list)
+
+    end subroutine add_compile_command_many
+
 end module fpm_compile_commands

src/fpm_sources.f90

@@ -8,20 +8,26 @@ module fpm_sources
 use fpm_model, only: srcfile_t, FPM_UNIT_PROGRAM
 use fpm_filesystem, only: basename, canon_path, dirname, join_path, list_files, is_hidden_file
 use fpm_environment, only: get_os_type,OS_WINDOWS
-use fpm_strings, only: lower, str_ends_with, string_t, operator(.in.)
+use fpm_strings, only: lower, str_ends_with, string_t, operator(.in.), add_strings
 use fpm_source_parsing, only: parse_f_source, parse_c_source
 use fpm_manifest_executable, only: executable_config_t
 use fpm_manifest_preprocess, only: preprocess_config_t
 implicit none
 
 private
 public :: add_sources_from_dir, add_executable_sources
-public :: get_exe_name_with_suffix
+public :: get_exe_name_with_suffix, add_srcfile
 
 character(4), parameter :: fortran_suffixes(2) = [".f90", &
                                                   ".f  "]
 character(4), parameter :: c_suffixes(4) = [".c  ", ".h  ", ".cpp", ".hpp"]
 
+!> Add one or multiple source files to a source file array (gcc-15 bug workaround)
+interface add_srcfile
+    module procedure add_srcfile_one
+    module procedure add_srcfile_many
+end interface add_srcfile
+
 contains
 
 !> Wrapper to source parsing routines.
@@ -159,7 +165,7 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,with_f_
     if (.not.allocated(sources)) then
         sources = pack(dir_sources,.not.exclude_source)
     else
-        sources = [sources, pack(dir_sources,.not.exclude_source)]
+        call add_srcfile(sources, pack(dir_sources,.not.exclude_source))
     end if
 
 end subroutine add_sources_from_dir
@@ -239,7 +245,7 @@ subroutine add_executable_sources(sources,executables,scope,auto_discover,with_f
         if (.not.allocated(sources)) then
             sources = [exe_source]
         else
-            sources = [sources, exe_source]
+            call add_srcfile(sources, exe_source)
         end if
 
     end do exe_loop
@@ -274,7 +280,7 @@ subroutine get_executable_source_dirs(exe_dirs,executables)
     if (.not.allocated(exe_dirs)) then
         exe_dirs = dirs_temp(1:n)
     else
-        exe_dirs = [exe_dirs,dirs_temp(1:n)]
+        call add_strings(exe_dirs,dirs_temp(1:n))
     end if
 
 end subroutine get_executable_source_dirs
@@ -296,4 +302,55 @@ function get_exe_name_with_suffix(source) result(suffixed)
 
 end function get_exe_name_with_suffix
 
+!> Add one source file to a source file array with a loop (gcc-15 bug on array initializer)
+pure subroutine add_srcfile_one(list,new)
+    type(srcfile_t), allocatable, intent(inout) :: list(:)
+    type(srcfile_t), intent(in) :: new
+
+    integer :: i,n
+    type(srcfile_t), allocatable :: tmp(:)
+
+    if (allocated(list)) then
+       n = size(list)
+    else
+       n = 0
+    end if
+
+    allocate(tmp(n+1))
+    do i=1,n
+       tmp(i) = list(i)
+    end do
+    tmp(n+1) = new
+    call move_alloc(from=tmp,to=list)
+
+end subroutine add_srcfile_one
+
+!> Add multiple source files to a source file array with a loop (gcc-15 bug on array initializer)
+pure subroutine add_srcfile_many(list,new)
+    type(srcfile_t), allocatable, intent(inout) :: list(:)
+    type(srcfile_t), intent(in) :: new(:)
+
+    integer :: i,n,add
+    type(srcfile_t), allocatable :: tmp(:)
+
+    if (allocated(list)) then
+       n = size(list)
+    else
+       n = 0
+    end if
+
+    add = size(new)
+    if (add == 0) return
+
+    allocate(tmp(n+add))
+    do i=1,n
+       tmp(i) = list(i)
+    end do
+    do i=1,add
+       tmp(n+i) = new(i)
+    end do
+    call move_alloc(from=tmp,to=list)
+
+end subroutine add_srcfile_many
+
 end module fpm_sources

src/fpm_targets.f90

@@ -47,7 +47,7 @@ module fpm_targets
        FPM_TARGET_SHARED,   FPM_TARGET_NAME
 public build_target_t, build_target_ptr
 public targets_from_sources, resolve_module_dependencies
-public add_target, new_target, add_dependency, get_library_dirs
+public add_target, new_target, add_dependency, get_library_dirs, add_target_ptr
 public filter_library_targets, filter_executable_targets, filter_modules
 
 
@@ -156,6 +156,12 @@ module fpm_targets
     module procedure add_old_targets
 end interface
 
+!> Add one or multiple build target pointers to array (gcc-15 bug workaround)
+interface add_target_ptr
+    module procedure add_target_ptr_one
+    module procedure add_target_ptr_many
+end interface add_target_ptr
+
 contains
 
 !> Target type name
@@ -699,7 +705,7 @@ subroutine add_old_targets(targets, add_targets)
         endassociate
     end do
 
-    targets = [targets, add_targets ]
+    call add_target_ptr(targets, add_targets)
 
 end subroutine add_old_targets
 
@@ -723,7 +729,7 @@ subroutine add_dependency(target, dependency)
     end do
     if (dependency%output_name==target%output_name) return
 
-    target%dependencies = [target%dependencies, build_target_ptr(dependency)]
+    call add_target_ptr(target%dependencies, build_target_ptr(dependency))
 
 end subroutine add_dependency
 
@@ -1545,4 +1551,55 @@ subroutine library_targets_to_deps(model, targets, target_ID)
 
 end subroutine library_targets_to_deps
 
+!> Add one build target pointer to array with a loop (gcc-15 bug on array initializer)
+subroutine add_target_ptr_one(list,new)
+    type(build_target_ptr), allocatable, intent(inout) :: list(:)
+    type(build_target_ptr), intent(in) :: new
+
+    integer :: i,n
+    type(build_target_ptr), allocatable :: tmp(:)
+
+    if (allocated(list)) then
+       n = size(list)
+    else
+       n = 0
+    end if
+
+    allocate(tmp(n+1))
+    do i=1,n
+       tmp(i) = list(i)
+    end do
+    tmp(n+1) = new
+    call move_alloc(from=tmp,to=list)
+
+end subroutine add_target_ptr_one
+
+!> Add multiple build target pointers to array with a loop (gcc-15 bug on array initializer)
+subroutine add_target_ptr_many(list,new)
+    type(build_target_ptr), allocatable, intent(inout) :: list(:)
+    type(build_target_ptr), intent(in) :: new(:)
+
+    integer :: i,n,add
+    type(build_target_ptr), allocatable :: tmp(:)
+
+    if (allocated(list)) then
+       n = size(list)
+    else
+       n = 0
+    end if
+
+    add = size(new)
+    if (add == 0) return
+
+    allocate(tmp(n+add))
+    do i=1,n
+       tmp(i) = list(i)
+    end do
+    do i=1,add
+       tmp(n+i) = new(i)
+    end do
+    call move_alloc(from=tmp,to=list)
+
+end subroutine add_target_ptr_many
+
 end module fpm_targets

src/metapackage/fpm_meta_base.f90

@@ -69,6 +69,12 @@ module fpm_meta_base
 
     end type metapackage_t
 
+    !> Add dependencies to array (gcc-15 bug workaround)
+    interface add_dependency_config
+        module procedure add_dependency_config_one
+        module procedure add_dependency_config_many
+    end interface add_dependency_config
+
     contains
 
     elemental subroutine destroy(this)
@@ -161,7 +167,7 @@ subroutine resolve_package_config(self,package,error)
         ! as they may change if built upstream
         if (self%has_dependencies) then
             if (allocated(package%dev_dependency)) then
-               package%dev_dependency = [package%dev_dependency,self%dependency]
+               call add_dependency_config(package%dev_dependency,self%dependency)
             else
                package%dev_dependency = self%dependency
             end if
@@ -234,4 +240,55 @@ end function dn
 
     end subroutine resolve_package_config
 
+    !> Add one dependency to array with a loop (gcc-15 bug on array initializer)
+    pure subroutine add_dependency_config_one(list,new)
+        type(dependency_config_t), allocatable, intent(inout) :: list(:)
+        type(dependency_config_t), intent(in) :: new
+
+        integer :: i,n
+        type(dependency_config_t), allocatable :: tmp(:)
+
+        if (allocated(list)) then
+           n = size(list)
+        else
+           n = 0
+        end if
+
+        allocate(tmp(n+1))
+        do i=1,n
+           tmp(i) = list(i)
+        end do
+        tmp(n+1) = new
+        call move_alloc(from=tmp,to=list)
+
+    end subroutine add_dependency_config_one
+
+    !> Add multiple dependencies to array with a loop (gcc-15 bug on array initializer)
+    pure subroutine add_dependency_config_many(list,new)
+        type(dependency_config_t), allocatable, intent(inout) :: list(:)
+        type(dependency_config_t), intent(in) :: new(:)
+
+        integer :: i,n,add
+        type(dependency_config_t), allocatable :: tmp(:)
+
+        if (allocated(list)) then
+           n = size(list)
+        else
+           n = 0
+        end if
+
+        add = size(new)
+        if (add == 0) return
+
+        allocate(tmp(n+add))
+        do i=1,n
+           tmp(i) = list(i)
+        end do
+        do i=1,add
+           tmp(n+i) = new(i)
+        end do
+        call move_alloc(from=tmp,to=list)
+
+    end subroutine add_dependency_config_many
+
 end module fpm_meta_base