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

Jump to bottom

Fix segmentation fault due to varargs on Apple M1 #48

Merged
merged 1 commit into from
Jul 23, 2022
Merged

Fix segmentation fault due to varargs on Apple M1 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 49 additions & 48 deletions apron/ap_abstract0.c
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apron/ap_abstract0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ bool ap_abstract0_checkman_array(ap_funid_t funid,
static inline
ap_dimension_t _ap_abstract0_dimension(ap_abstract0_t* a)
{
ap_dimension_t (*ptr)(ap_manager_t*,...) = (ap_dimension_t (*) (ap_manager_t*,...))(a->man->funptr[AP_FUNID_DIMENSION]);
ap_dimension_t (*ptr)(ap_manager_t*, void*) = (ap_dimension_t (*) (ap_manager_t*, void*))(a->man->funptr[AP_FUNID_DIMENSION]);
return ptr(a->man,a->value);
}

Expand Down
2 changes: 1 addition & 1 deletion apron/ap_abstract1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ ap_abstract1_t ap_abstract1_meetjoin_array(ap_funid_t funid, ap_manager_t* man,
ap_abstract1_check_env_array(funid,man,tab,size)){
size_t i;
ap_abstract0_t* res0;
void* (*ptr)(ap_manager_t*,...) = man->funptr[funid];
void* (*ptr)(ap_manager_t*,void**,size_t) = man->funptr[funid];
void** ntab = malloc(size*sizeof(void*));
for (i=0;i<size;i++) ntab[i] = tab[i].abstract0->value;
res0 = malloc(sizeof(ap_abstract0_t));
Expand Down
94 changes: 47 additions & 47 deletions apron/ap_disjunction.c
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions apron/ap_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ bool ap_generic_sat_tcons(ap_manager_t* man, void* abs, ap_tcons0_t* cons,
ap_scalar_discr_t discr,
bool quasilinearize)
{
bool (*is_bottom)(ap_manager_t*,...) = man->funptr[AP_FUNID_IS_BOTTOM];
bool (*sat_lincons)(ap_manager_t*,...) = man->funptr[AP_FUNID_SAT_LINCONS];
bool (*is_bottom)(ap_manager_t*,void*) = man->funptr[AP_FUNID_IS_BOTTOM];
bool (*sat_lincons)(ap_manager_t*,void*,ap_lincons0_t*) = man->funptr[AP_FUNID_SAT_LINCONS];
bool exact;
ap_lincons0_t lincons0;
bool res;
Expand Down Expand Up @@ -62,8 +62,8 @@ bool ap_generic_sat_tcons(ap_manager_t* man, void* abs, ap_tcons0_t* cons,
ap_interval_t* ap_generic_bound_texpr(ap_manager_t* man, void* abs, ap_texpr0_t* expr,
ap_scalar_discr_t discr, bool quasilinearize)
{
bool (*is_bottom)(ap_manager_t*,...) = man->funptr[AP_FUNID_IS_BOTTOM];
ap_interval_t* (*bound_linexpr)(ap_manager_t*,...) = man->funptr[AP_FUNID_BOUND_LINEXPR];
bool (*is_bottom)(ap_manager_t*,void*) = man->funptr[AP_FUNID_IS_BOTTOM];
ap_interval_t* (*bound_linexpr)(ap_manager_t*,void*,ap_linexpr0_t*) = man->funptr[AP_FUNID_BOUND_LINEXPR];
bool exact;
ap_linexpr0_t* linexpr0;
ap_interval_t* res;
Expand All @@ -89,7 +89,7 @@ ap_interval_t* ap_generic_bound_texpr(ap_manager_t* man, void* abs, ap_texpr0_t*
ap_tcons0_array_t ap_generic_to_tcons_array(ap_manager_t* man,
void* abs)
{
ap_lincons0_array_t (*to_lincons_array)(ap_manager_t*,...) = man->funptr[AP_FUNID_TO_LINCONS_ARRAY];
ap_lincons0_array_t (*to_lincons_array)(ap_manager_t*,void*) = man->funptr[AP_FUNID_TO_LINCONS_ARRAY];
ap_lincons0_array_t array = to_lincons_array(man,abs);
ap_tcons0_array_t res = ap_tcons0_array_make(array.size);
size_t i;
Expand Down Expand Up @@ -117,8 +117,8 @@ void* ap_generic_meetjoin_array(bool meet,
ap_manager_t* man,
void** tab, size_t size)
{
void* (*copy)(ap_manager_t*,...) = man->funptr[AP_FUNID_COPY];
void* (*meetjoin)(ap_manager_t*,...) = man->funptr[meet ? AP_FUNID_MEET : AP_FUNID_JOIN];
void* (*copy)(ap_manager_t*,void*) = man->funptr[AP_FUNID_COPY];
void* (*meetjoin)(ap_manager_t*,bool,void*,void*) = man->funptr[meet ? AP_FUNID_MEET : AP_FUNID_JOIN];
size_t i;
void* res;
bool exact,best;
Expand Down Expand Up @@ -158,13 +158,13 @@ ap_generic_meet_quasilinearize_lincons_array(ap_manager_t* man,
bool exact;
ap_lincons0_array_t array2;
void* res;
void* (*copy)(ap_manager_t*,...) = man->funptr[AP_FUNID_COPY];
bool (*is_bottom)(ap_manager_t*,...) = man->funptr[AP_FUNID_IS_BOTTOM];
void* (*copy)(ap_manager_t*,void*) = man->funptr[AP_FUNID_COPY];
bool (*is_bottom)(ap_manager_t*,void*) = man->funptr[AP_FUNID_IS_BOTTOM];

man->result.flag_exact = man->result.flag_best = true;

if (is_bottom(man,abs) || array->size==0){
res = destructive ? abs : copy(abs);
res = destructive ? abs : copy(man,abs);
}
else {
array2 = ap_quasilinearize_lincons0_array(man,abs,array,&exact,
Expand Down Expand Up @@ -194,8 +194,8 @@ ap_generic_meet_intlinearize_tcons_array(ap_manager_t* man,
bool exact;
ap_lincons0_array_t array2;
void* res;
void* (*copy)(ap_manager_t*,...) = man->funptr[AP_FUNID_COPY];
bool (*is_bottom)(ap_manager_t*,...) = man->funptr[AP_FUNID_IS_BOTTOM];
void* (*copy)(ap_manager_t*,void*) = man->funptr[AP_FUNID_COPY];
bool (*is_bottom)(ap_manager_t*,void*) = man->funptr[AP_FUNID_IS_BOTTOM];
ap_abstract0_t a0;

man->result.flag_exact = man->result.flag_best = true;
Expand Down Expand Up @@ -249,15 +249,15 @@ void* ap_generic_asssub_linexpr_array(bool assign,
bool destructive, void* abs, ap_dim_t* tdim, ap_linexpr0_t** texpr, size_t size,
void* dest)
{
bool (*is_bottom)(ap_manager_t*,...) = man->funptr[AP_FUNID_IS_BOTTOM];
void* (*copy)(ap_manager_t*,...) = man->funptr[AP_FUNID_COPY];
void* (*add_dimensions)(ap_manager_t*,...) = man->funptr[AP_FUNID_ADD_DIMENSIONS];
void* (*permute_dimensions)(ap_manager_t*,...) = man->funptr[AP_FUNID_PERMUTE_DIMENSIONS];
void* (*remove_dimensions)(ap_manager_t*,...) = man->funptr[AP_FUNID_REMOVE_DIMENSIONS];
void* (*meet_lincons_array)(ap_manager_t*,...) = man->funptr[AP_FUNID_MEET_LINCONS_ARRAY];
void* (*meet)(ap_manager_t*,...) = man->funptr[AP_FUNID_MEET];
void (*ap_free)(ap_manager_t*,...) = man->funptr[AP_FUNID_FREE];
ap_dimension_t (*dimension)(ap_manager_t*,...) = man->funptr[AP_FUNID_DIMENSION];
bool (*is_bottom)(ap_manager_t*,void*) = man->funptr[AP_FUNID_IS_BOTTOM];
void* (*copy)(ap_manager_t*,void*) = man->funptr[AP_FUNID_COPY];
void* (*add_dimensions)(ap_manager_t*,bool,void*,ap_dimchange_t*,bool) = man->funptr[AP_FUNID_ADD_DIMENSIONS];
void* (*permute_dimensions)(ap_manager_t*,bool,void*,ap_dimperm_t*) = man->funptr[AP_FUNID_PERMUTE_DIMENSIONS];
void* (*remove_dimensions)(ap_manager_t*,bool,void*,ap_dimchange_t*) = man->funptr[AP_FUNID_REMOVE_DIMENSIONS];
void* (*meet_lincons_array)(ap_manager_t*,bool,void*,ap_lincons0_array_t*) = man->funptr[AP_FUNID_MEET_LINCONS_ARRAY];
void* (*meet)(ap_manager_t*,bool,void*,void*) = man->funptr[AP_FUNID_MEET];
void (*ap_free)(ap_manager_t*,void*) = man->funptr[AP_FUNID_FREE];
ap_dimension_t (*dimension)(ap_manager_t*,void*) = man->funptr[AP_FUNID_DIMENSION];
size_t i;
ap_dimension_t d, dsup;
ap_dimchange_t dimchange;
Expand Down Expand Up @@ -384,15 +384,15 @@ void* ap_generic_asssub_texpr_array(bool assign,
bool destructive, void* abs, ap_dim_t* tdim, ap_texpr0_t** texpr, size_t size,
void* dest)
{
bool (*is_bottom)(ap_manager_t*,...) = man->funptr[AP_FUNID_IS_BOTTOM];
void* (*copy)(ap_manager_t*,...) = man->funptr[AP_FUNID_COPY];
void* (*add_dimensions)(ap_manager_t*,...) = man->funptr[AP_FUNID_ADD_DIMENSIONS];
void* (*permute_dimensions)(ap_manager_t*,...) = man->funptr[AP_FUNID_PERMUTE_DIMENSIONS];
void* (*remove_dimensions)(ap_manager_t*,...) = man->funptr[AP_FUNID_REMOVE_DIMENSIONS];
void* (*meet_tcons_array)(ap_manager_t*,...) = man->funptr[AP_FUNID_MEET_TCONS_ARRAY];
void* (*meet)(ap_manager_t*,...) = man->funptr[AP_FUNID_MEET];
void (*ap_free)(ap_manager_t*,...) = man->funptr[AP_FUNID_FREE];
ap_dimension_t (*dimension)(ap_manager_t*,...) = man->funptr[AP_FUNID_DIMENSION];
bool (*is_bottom)(ap_manager_t*,void*) = man->funptr[AP_FUNID_IS_BOTTOM];
void* (*copy)(ap_manager_t*,void*) = man->funptr[AP_FUNID_COPY];
void* (*add_dimensions)(ap_manager_t*,bool,void*,ap_dimchange_t*,bool) = man->funptr[AP_FUNID_ADD_DIMENSIONS];
void* (*permute_dimensions)(ap_manager_t*,bool,void*,ap_dimperm_t*) = man->funptr[AP_FUNID_PERMUTE_DIMENSIONS];
void* (*remove_dimensions)(ap_manager_t*,bool,void*,ap_dimchange_t*) = man->funptr[AP_FUNID_REMOVE_DIMENSIONS];
void* (*meet_tcons_array)(ap_manager_t*,bool,void*,ap_tcons0_array_t*) = man->funptr[AP_FUNID_MEET_TCONS_ARRAY];
void* (*meet)(ap_manager_t*,bool,void*,void*) = man->funptr[AP_FUNID_MEET];
void (*ap_free)(ap_manager_t*,void*) = man->funptr[AP_FUNID_FREE];
ap_dimension_t (*dimension)(ap_manager_t*,void*) = man->funptr[AP_FUNID_DIMENSION];
size_t i;
ap_dimension_t d, dsup;
ap_dimchange_t dimchange;
Expand Down
24 changes: 12 additions & 12 deletions apron/ap_policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ bool ap_abstract0_policy_check_policy_abstract(

res = ap_policy_check(funid,pman,policy);
if (res && policy!=NULL && policy->value!=NULL){
size_t (*pfunptr)(ap_policy_manager_t*,...) = pman->funptr[AP_FUNPOLICYID_DIMENSION];
ap_dimension_t (*funptr)(ap_manager_t*, ...) = pman->man->funptr[AP_FUNID_DIMENSION];
size_t (*pfunptr)(ap_policy_manager_t*,void*) = pman->funptr[AP_FUNPOLICYID_DIMENSION];
ap_dimension_t (*funptr)(ap_manager_t*, void*) = pman->man->funptr[AP_FUNID_DIMENSION];
size_t nbdims = pfunptr(pman,policy->value);
ap_dimension_t dimen = funptr(pman->man,a->value);
if (nbdims != dimen.intdim+dimen.realdim){
Expand Down Expand Up @@ -217,7 +217,7 @@ ap_abstract0_policy_meet_apply(ap_policy_manager_t* pman,
if (ap_abstract0_checkman2(funid,pman->man,a1,a2) &&
ap_abstract0_check_abstract2(funid,pman->man,a1,a2) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,a1)){
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,bool,void*,void*) = pman->funptr[funpid];
void* value = ptr(pman,policy->value,destructive,a1->value,a2->value);
return ap_abstract0_cons2(pman->man,destructive,a1,value);
}
Expand All @@ -241,7 +241,7 @@ ap_abstract0_policy_meet_array_apply(ap_policy_manager_t* pman,
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,tab[0])){
size_t i;
ap_abstract0_t* res;
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void**,size_t) = pman->funptr[funpid];
void** ntab = malloc(size*sizeof(void*));
for (i=0;i<size;i++) ntab[i] = tab[i]->value;
res = ap_abstract0_cons(pman->man,ptr(pman,policy->value,ntab,size));
Expand Down Expand Up @@ -269,7 +269,7 @@ ap_abstract0_policy_meet_lincons_array_apply(ap_policy_manager_t* pman,
if (ap_abstract0_checkman1(funid,pman->man,a) &&
ap_abstract0_check_lincons_array(funid,pman->man,dimension,array) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,a)){
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,bool,void*,ap_lincons0_array_t*) = pman->funptr[funpid];
void* value = ptr(pman,policy->value,destructive,a->value,array);
return ap_abstract0_cons2(pman->man,destructive,a,value);
}
Expand All @@ -291,7 +291,7 @@ ap_abstract0_policy_meet_tcons_array_apply(ap_policy_manager_t* pman,
if (ap_abstract0_checkman1(funid,pman->man,a) &&
ap_abstract0_check_tcons_array(funid,pman->man,dimension,array) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,a)){
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,bool,void*,ap_tcons0_array_t*) = pman->funptr[funpid];
void* value = ptr(pman,policy->value,destructive,a->value,array);
return ap_abstract0_cons2(pman->man,destructive,a,value);
}
Expand All @@ -312,7 +312,7 @@ ap_abstract0_policy_meet_improve(ap_policy_manager_t* pman,
if (ap_abstract0_checkman2(funid,pman->man,a1,a2) &&
ap_abstract0_check_abstract2(funid,pman->man,a1,a2) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,a1)){
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void*,void*) = pman->funptr[funpid];
void* value = ptr(pman,(policy ? policy->value : NULL),a1->value,a2->value);
return ap_policy_cons(pman,policy,value);
}
Expand All @@ -332,7 +332,7 @@ ap_abstract0_policy_meet_array_improve(ap_policy_manager_t* pman,
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,tab[0])){
size_t i;
ap_policy_t* res;
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void**,size_t) = pman->funptr[funpid];
void** ntab = malloc(size*sizeof(void*));
for (i=0;i<size;i++) ntab[i] = tab[i]->value;
res = ap_policy_cons(pman,policy,ptr(pman,(policy ? policy->value : NULL),ntab,size));
Expand All @@ -354,7 +354,7 @@ ap_abstract0_policy_meet_lincons_array_improve(ap_policy_manager_t* pman,
if (ap_abstract0_checkman1(funid,pman->man,a) &&
ap_abstract0_check_lincons_array(funid,pman->man,dimension,array) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,a)){
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void*,ap_lincons0_array_t*) = pman->funptr[funpid];
void* value = ptr(pman,(policy ? policy->value : NULL),a->value,array);
return ap_policy_cons(pman,policy,value);
}
Expand All @@ -373,7 +373,7 @@ ap_abstract0_policy_meet_tcons_array_improve(ap_policy_manager_t* pman,
if (ap_abstract0_checkman1(funid,pman->man,a) &&
ap_abstract0_check_tcons_array(funid,pman->man,dimension,array) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,a)){
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void*,ap_tcons0_array_t*) = pman->funptr[funpid];
void* value = ptr(pman,(policy ? policy->value : NULL),a->value,array);
return ap_policy_cons(pman,policy,value);
}
Expand Down Expand Up @@ -560,7 +560,7 @@ ap_abstract1_policy_meet_array_apply(ap_policy_manager_t* pman, ap_policy_t* pol
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,tab[0].abstract0)){
size_t i;
ap_abstract0_t* res0;
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void**,size_t) = pman->funptr[funpid];
void** ntab = malloc(size*sizeof(void*));
for (i=0;i<size;i++) ntab[i] = tab[i].abstract0->value;
res0 = malloc(sizeof(ap_abstract0_t));
Expand Down Expand Up @@ -677,7 +677,7 @@ ap_abstract1_policy_meet_array_improve(ap_policy_manager_t* pman, ap_policy_t* p
ap_abstract1_check_env_array(funid,pman->man,tab,size) &&
ap_abstract0_policy_check_policy_abstract(funpid,pman,policy,tab[0].abstract0)){
size_t i;
void* (*ptr)(ap_policy_manager_t*,...) = pman->funptr[funpid];
void* (*ptr)(ap_policy_manager_t*,void*,void**,size_t) = pman->funptr[funpid];
void** ntab = malloc(size*sizeof(void*));
for (i=0;i<size;i++) ntab[i] = tab[i].abstract0->value;
res = ap_policy_cons(pman,policy,ptr(pman,policy->value,ntab,size));
Expand Down
Loading