diff --git a/FactGenerator/include/predicates.inc b/FactGenerator/include/predicates.inc index c235853..cc8789c 100644 --- a/FactGenerator/include/predicates.inc +++ b/FactGenerator/include/predicates.inc @@ -35,7 +35,7 @@ GROUP_BEGIN(alias) PREDICATE(alias, id, alias) PREDICATE2(alias, name) PREDICATE2(alias, type) -PREDICATE(alias, linkage, alias_linkage_type) +PREDICATE2(alias, linkage) PREDICATE2(alias, visibility) PREDICATE2(alias, aliasee) GROUP_END(alias) diff --git a/datalog/export/debug-output-extended.dl b/datalog/export/debug-output-extended.dl index 467c46f..24673bf 100644 --- a/datalog/export/debug-output-extended.dl +++ b/datalog/export/debug-output-extended.dl @@ -53,7 +53,7 @@ .output aggregate_type (compress=true) .output alias (compress=true) .output alias_aliasee (compress=true) -.output alias_linkage_type (compress=true) +.output alias_linkage (compress=true) .output alias_name (compress=true) .output alias_type (compress=true) .output alias_visibility (compress=true) diff --git a/datalog/export/debug-output.dl b/datalog/export/debug-output.dl index 467c46f..24673bf 100644 --- a/datalog/export/debug-output.dl +++ b/datalog/export/debug-output.dl @@ -53,7 +53,7 @@ .output aggregate_type (compress=true) .output alias (compress=true) .output alias_aliasee (compress=true) -.output alias_linkage_type (compress=true) +.output alias_linkage (compress=true) .output alias_name (compress=true) .output alias_type (compress=true) .output alias_visibility (compress=true) diff --git a/datalog/schema/global.dl b/datalog/schema/global.dl index 05968a7..e313932 100644 --- a/datalog/schema/global.dl +++ b/datalog/schema/global.dl @@ -136,7 +136,7 @@ local_exec_threadlocal_mode("thread_local(localexec)"). .decl alias_aliasee(x:Alias, y:Constant) .decl alias_name(x:Alias, name:symbol) .decl alias_type(x:Alias, type:Type) -.decl alias_linkage_type(x:Alias, link:LinkageType) +.decl alias_linkage(x:Alias, link:LinkageType) .decl alias_visibility(x:Alias, vis:Visibility) // For constraints @@ -154,7 +154,7 @@ schema_invalid_alias(Var, __FILE__, __LINE__) :- schema_invalid_alias(Var, __FILE__, __LINE__) :- schema_sanity(), - alias_linkage_type(Var, Link), + alias_linkage(Var, Link), !private_linkage_type(Link), !linker_private_linkage_type(Link), !linker_private_weak_linkage_type(Link),