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.

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

fix atomic intrinsics implementation issues #49967

Merged
merged 1 commit into from
May 30, 2023
Merged

Conversation

vtjnash
Copy link
Member

@vtjnash vtjnash commented May 26, 2023

  • jltypes: add missing GC root for cmpswap_type Tuple This is called with a fieldtype, which might not even be a DataType.

  • support Ptr{Union{}} and Ptr{Cvoid} better

As seen on CI run here: https://buildkite.com/julialang/julia-master/builds/24304#018858f7-adce-4928-8aad-51ad6584b439

* jltypes: add missing GC root for cmpswap_type Tuple
  This is called with a fieldtype, which might not even be a DataType.

* support Ptr{Union{}} and Ptr{Cvoid} better
@vtjnash vtjnash added multithreading Base.Threads and related functionality bugfix This change fixes an existing bug backport 1.9 Change should be backported to release-1.9 labels May 26, 2023
@vtjnash vtjnash merged commit bd5e6da into master May 30, 2023
@vtjnash vtjnash deleted the jn/apply_cmpswap-root branch May 30, 2023 19:11
@KristofferC KristofferC mentioned this pull request Jun 6, 2023
36 tasks
@KristofferC
Copy link
Member

Backporting this I get:

/home/kc/julia1.9/src/jltypes.c: In function 'ijl_apply_cmpswap_type':
./jl_internal_funcs.inc:16:31: warning: initialization of 'jl_value_t *' {aka 'struct _jl_value_t *'} from incompatible pointer type 'jl_tupletype_t *' {aka 'struct _jl_datatype_t *'} [-Wincompatible-pointer-types]
   16 | #define jl_apply_tuple_type_v ijl_apply_tuple_type_v
      |                               ^~~~~~~~~~~~~~~~~~~~~~
/home/kc/julia1.9/src/jltypes.c:1187:26: note: in expansion of macro 'jl_apply_tuple_type_v'
 1187 |     jl_value_t *tuptyp = jl_apply_tuple_type_v(params, 2);

@vtjnash
Copy link
Member Author

vtjnash commented Jun 27, 2023

It just needs a cast to remove the warning

KristofferC pushed a commit that referenced this pull request Jun 27, 2023
* jltypes: add missing GC root for cmpswap_type Tuple.
  This is called with a fieldtype, which might not even be a DataType.

* support Ptr{Union{}} and Ptr{Cvoid} better

(cherry picked from commit bd5e6da)
KristofferC pushed a commit that referenced this pull request Jun 27, 2023
* jltypes: add missing GC root for cmpswap_type Tuple.
  This is called with a fieldtype, which might not even be a DataType.

* support Ptr{Union{}} and Ptr{Cvoid} better

(cherry picked from commit bd5e6da)
@KristofferC KristofferC removed the backport 1.9 Change should be backported to release-1.9 label Jul 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix This change fixes an existing bug multithreading Base.Threads and related functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants