Skip to content

Commit 3704eac

Browse files
authored
Merge pull request #17315 from JuliaLang/yyc/codegen/aa64-abi
Fix AArch64 ABI segfault in early bootstrap
2 parents 32127b0 + 28e3d76 commit 3704eac

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/abi_aarch64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ static Type *get_llvm_fptype(jl_datatype_t *dt)
8383
default:
8484
return nullptr;
8585
}
86-
return jl_is_floattype((jl_value_t*)dt) ? lltype : nullptr;
86+
return ((jl_floatingpoint_type && jl_is_floattype((jl_value_t*)dt)) ?
87+
lltype : nullptr);
8788
}
8889

8990
static Type *get_llvm_fp_or_vectype(jl_datatype_t *dt)

src/abi_arm.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ static Type *get_llvm_fptype(jl_datatype_t *dt)
5454
default:
5555
return NULL;
5656
}
57-
return jl_is_floattype((jl_value_t*)dt) ? lltype : NULL;
57+
return ((jl_floatingpoint_type && jl_is_floattype((jl_value_t*)dt)) ?
58+
lltype : NULL);
5859
}
5960

6061
static size_t isLegalHA(jl_datatype_t *dt, Type *&base);

0 commit comments

Comments
 (0)