Skip to content

When accessing the data pointer for an array, first decay it to a Derived Pointer #54335

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

Merged
merged 3 commits into from
May 3, 2024
Merged

When accessing the data pointer for an array, first decay it to a Derived Pointer #54335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2acd75b
When accessing the data pointer for an array, first decay it to a Der…
gbaraldi May 2, 2024
512f095
Enable Strong verifier when building with assertions
gbaraldi May 2, 2024
70f6990
Make the analyzer happier
gbaraldi May 3, 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
1 change: 1 addition & 0 deletions src/cgutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3053,6 +3053,7 @@ static Value *emit_genericmemoryptr(jl_codectx_t &ctx, Value *mem, const jl_data
PointerType *PT = cast<PointerType>(mem->getType());
assert(PT == ctx.types().T_prjlvalue);
Value *addr = emit_bitcast(ctx, mem, ctx.types().T_jlgenericmemory->getPointerTo(PT->getAddressSpace()));
addr = decay_derived(ctx, addr);
addr = ctx.builder.CreateStructGEP(ctx.types().T_jlgenericmemory, addr, 1);
setName(ctx.emission_context, addr, ".data_ptr");
PointerType *PPT = cast<PointerType>(ctx.types().T_jlgenericmemory->getElementType(1));
Expand Down
89 changes: 43 additions & 46 deletions src/clangsa/GCChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,57 +795,54 @@ static bool isMutexUnlock(StringRef name) {
false;
}

#if LLVM_VERSION_MAJOR >= 13
#define endswith_lower endswith_insensitive
#endif

bool GCChecker::isGCTrackedType(QualType QT) {
return isJuliaType(
[](StringRef Name) {
if (Name.endswith_lower("jl_value_t") ||
Name.endswith_lower("jl_svec_t") ||
Name.endswith_lower("jl_sym_t") ||
Name.endswith_lower("jl_expr_t") ||
Name.endswith_lower("jl_code_info_t") ||
Name.endswith_lower("jl_array_t") ||
Name.endswith_lower("jl_genericmemory_t") ||
//Name.endswith_lower("jl_genericmemoryref_t") ||
Name.endswith_lower("jl_method_t") ||
Name.endswith_lower("jl_method_instance_t") ||
Name.endswith_lower("jl_debuginfo_t") ||
Name.endswith_lower("jl_tupletype_t") ||
Name.endswith_lower("jl_datatype_t") ||
Name.endswith_lower("jl_typemap_entry_t") ||
Name.endswith_lower("jl_typemap_level_t") ||
Name.endswith_lower("jl_typename_t") ||
Name.endswith_lower("jl_module_t") ||
Name.endswith_lower("jl_tupletype_t") ||
Name.endswith_lower("jl_gc_tracked_buffer_t") ||
Name.endswith_lower("jl_binding_t") ||
Name.endswith_lower("jl_ordereddict_t") ||
Name.endswith_lower("jl_tvar_t") ||
Name.endswith_lower("jl_typemap_t") ||
Name.endswith_lower("jl_unionall_t") ||
Name.endswith_lower("jl_methtable_t") ||
Name.endswith_lower("jl_cgval_t") ||
Name.endswith_lower("jl_codectx_t") ||
Name.endswith_lower("jl_ast_context_t") ||
Name.endswith_lower("jl_code_instance_t") ||
Name.endswith_lower("jl_excstack_t") ||
Name.endswith_lower("jl_task_t") ||
Name.endswith_lower("jl_uniontype_t") ||
Name.endswith_lower("jl_method_match_t") ||
Name.endswith_lower("jl_vararg_t") ||
Name.endswith_lower("jl_opaque_closure_t") ||
Name.endswith_lower("jl_globalref_t") ||
if (Name.ends_with_insensitive("jl_value_t") ||
Name.ends_with_insensitive("jl_svec_t") ||
Name.ends_with_insensitive("jl_sym_t") ||
Name.ends_with_insensitive("jl_expr_t") ||
Name.ends_with_insensitive("jl_code_info_t") ||
Name.ends_with_insensitive("jl_array_t") ||
Name.ends_with_insensitive("jl_genericmemory_t") ||
//Name.ends_with_insensitive("jl_genericmemoryref_t") ||
Name.ends_with_insensitive("jl_method_t") ||
Name.ends_with_insensitive("jl_method_instance_t") ||
Name.ends_with_insensitive("jl_debuginfo_t") ||
Name.ends_with_insensitive("jl_tupletype_t") ||
Name.ends_with_insensitive("jl_datatype_t") ||
Name.ends_with_insensitive("jl_typemap_entry_t") ||
Name.ends_with_insensitive("jl_typemap_level_t") ||
Name.ends_with_insensitive("jl_typename_t") ||
Name.ends_with_insensitive("jl_module_t") ||
Name.ends_with_insensitive("jl_tupletype_t") ||
Name.ends_with_insensitive("jl_gc_tracked_buffer_t") ||
Name.ends_with_insensitive("jl_binding_t") ||
Name.ends_with_insensitive("jl_ordereddict_t") ||
Name.ends_with_insensitive("jl_tvar_t") ||
Name.ends_with_insensitive("jl_typemap_t") ||
Name.ends_with_insensitive("jl_unionall_t") ||
Name.ends_with_insensitive("jl_methtable_t") ||
Name.ends_with_insensitive("jl_cgval_t") ||
Name.ends_with_insensitive("jl_codectx_t") ||
Name.ends_with_insensitive("jl_ast_context_t") ||
Name.ends_with_insensitive("jl_code_instance_t") ||
Name.ends_with_insensitive("jl_excstack_t") ||
Name.ends_with_insensitive("jl_task_t") ||
Name.ends_with_insensitive("jl_uniontype_t") ||
Name.ends_with_insensitive("jl_method_match_t") ||
Name.ends_with_insensitive("jl_vararg_t") ||
Name.ends_with_insensitive("jl_opaque_closure_t") ||
Name.ends_with_insensitive("jl_globalref_t") ||
// Probably not technically true for these, but let's allow it
Name.endswith_lower("typemap_intersection_env") ||
Name.endswith_lower("interpreter_state") ||
Name.endswith_lower("jl_typeenv_t") ||
Name.endswith_lower("jl_stenv_t") ||
Name.endswith_lower("jl_varbinding_t") ||
Name.endswith_lower("set_world") ||
Name.endswith_lower("jl_codectx_t")) {
Name.ends_with_insensitive("typemap_intersection_env") ||
Name.ends_with_insensitive("interpreter_state") ||
Name.ends_with_insensitive("jl_typeenv_t") ||
Name.ends_with_insensitive("jl_stenv_t") ||
Name.ends_with_insensitive("jl_varbinding_t") ||
Name.ends_with_insensitive("set_world") ||
Name.ends_with_insensitive("jl_codectx_t")) {
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/passes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct RemoveNIPass : PassInfoMixin<RemoveNIPass> {

struct MultiVersioningPass : PassInfoMixin<MultiVersioningPass> {
bool external_use;
MultiVersioningPass(bool external_use = false) : external_use(external_use) {}
MultiVersioningPass(bool external_use = false) JL_NOTSAFEPOINT : external_use(external_use) {}
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM) JL_NOTSAFEPOINT;
static bool isRequired() { return true; }
};
Expand Down
9 changes: 5 additions & 4 deletions src/pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,11 @@ namespace {
// }
}

#ifdef JL_DEBUG_BUILD
#ifdef JL_VERIFY_PASSES
static inline void addVerificationPasses(ModulePassManager &MPM, bool llvm_only) JL_NOTSAFEPOINT {
if (!llvm_only)
MPM.addPass(llvm::createModuleToFunctionPassAdaptor(GCInvariantVerifierPass()));
if (!llvm_only){
MPM.addPass(llvm::createModuleToFunctionPassAdaptor(GCInvariantVerifierPass(true)));
}
MPM.addPass(VerifierPass());
}
#endif
Expand Down Expand Up @@ -332,7 +333,7 @@ namespace {

static void buildEarlySimplificationPipeline(ModulePassManager &MPM, PassBuilder *PB, OptimizationLevel O, const OptimizationOptions &options) JL_NOTSAFEPOINT {
MPM.addPass(BeforeEarlySimplificationMarkerPass());
#ifdef JL_DEBUG_BUILD
#ifdef JL_VERIFY_PASSES
addVerificationPasses(MPM, options.llvm_only);
#endif
if (options.enable_early_simplifications) {
Expand Down