Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports for 1.10.4 #54416

Merged
merged 13 commits into from
May 30, 2024
Merged

Backports for 1.10.4 #54416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0f607a
Add inventory writing via DocumenterInventoryWritingBackport
goerz Mar 4, 2024
525b3a2
Overload `Base.literal_pow` for `AbstractQ` (#54010)
dkarrasch Apr 13, 2024
58cf81e
Fix `make install` from tarballs (#54143)
nalimilan Apr 22, 2024
3577557
LinearAlgebra: Correct zero element in `_generic_matvecmul!` for bloc…
jishnub Apr 23, 2024
1de708b
set MAX_OS_WRITE on unix (#54233)
vtjnash Apr 25, 2024
f752249
fix typo in gc_mark_memory8 when chunking a large array (#54251)
d-netto Apr 26, 2024
1b21830
typeintersect: fix another stack overflow caused by circular constrai…
N5N3 May 7, 2024
e1b2099
Fix an off-by-one error in interpreter's `do_invoke` (#54443)
fatteneder May 17, 2024
94bef5d
Make TestLogger thread-safe (introduce a lock) (#54497)
NHDaly May 22, 2024
7eeeb56
Add a missing doc (#53796)
putianyi889 May 24, 2024
007d8de
Set storage class of julia globals to dllimport on windows to avoid a…
gbaraldi May 28, 2024
c81d02c
typeintersect: conservative typevar subtitution during `finish_uniona…
N5N3 May 16, 2024
7ebe203
typeintersect: followup cleanup for the nothrow path of type instanti…
N5N3 May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
typeintersect: conservative typevar subtitution during `finish_uniona… 
…ll` (#54465)

(cherry picked from commit a946631)
  • Loading branch information
@N5N3
N5N3 committed May 28, 2024
commit c81d02cf41ea0e3aa3d46acb9ac468110d0fb1b3
6 changes: 3 additions & 3 deletions src/builtins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,11 +1365,11 @@ JL_CALLABLE(jl_f_apply_type)
jl_vararg_t *vm = (jl_vararg_t*)args[0];
if (!vm->T) {
JL_NARGS(apply_type, 2, 3);
return (jl_value_t*)jl_wrap_vararg(args[1], nargs == 3 ? args[2] : NULL, 1);
return (jl_value_t*)jl_wrap_vararg(args[1], nargs == 3 ? args[2] : NULL, 1, 0);
}
else if (!vm->N) {
JL_NARGS(apply_type, 2, 2);
return (jl_value_t*)jl_wrap_vararg(vm->T, args[1], 1);
return (jl_value_t*)jl_wrap_vararg(vm->T, args[1], 1, 0);
}
}
else if (jl_is_unionall(args[0])) {
Expand Down Expand Up @@ -2060,7 +2060,7 @@ void jl_init_primitives(void) JL_GC_DISABLED
add_builtin("Tuple", (jl_value_t*)jl_anytuple_type);
add_builtin("TypeofVararg", (jl_value_t*)jl_vararg_type);
add_builtin("SimpleVector", (jl_value_t*)jl_simplevector_type);
add_builtin("Vararg", (jl_value_t*)jl_wrap_vararg(NULL, NULL, 0));
add_builtin("Vararg", (jl_value_t*)jl_wrap_vararg(NULL, NULL, 0, 0));

add_builtin("Module", (jl_value_t*)jl_module_type);
add_builtin("MethodTable", (jl_value_t*)jl_methtable_type);
Expand Down
4 changes: 2 additions & 2 deletions src/gf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ static jl_value_t *inst_varargp_in_env(jl_value_t *decl, jl_svec_t *sparams)
vm = T_has_tv ? jl_type_unionall(v, T) : T;
if (N_has_tv)
N = NULL;
vm = (jl_value_t*)jl_wrap_vararg(vm, N, 1); // this cannot throw for these inputs
vm = (jl_value_t*)jl_wrap_vararg(vm, N, 1, 0); // this cannot throw for these inputs
}
sp++;
decl = ((jl_unionall_t*)decl)->body;
Expand Down Expand Up @@ -984,7 +984,7 @@ static void jl_compilation_sig(
// avoid Vararg{Type{Type{...}}}
if (jl_is_type_type(type_i) && jl_is_type_type(jl_tparam0(type_i)))
type_i = (jl_value_t*)jl_type_type;
type_i = (jl_value_t*)jl_wrap_vararg(type_i, (jl_value_t*)NULL, 1); // this cannot throw for these inputs
type_i = (jl_value_t*)jl_wrap_vararg(type_i, (jl_value_t*)NULL, 1, 0); // this cannot throw for these inputs
}
else {
type_i = inst_varargp_in_env(decl, sparams);
Expand Down
Loading