Skip to content

Commit 6276128

Browse files
committed
Disable trigger rule, since it's not compatible with negation delay.
Temporarily disable MC_E too.
1 parent 9064f05 commit 6276128

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

share/prolog/oorules/rules.pl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,13 +2253,14 @@
22532253
% information about the direction of that relationship.
22542254
:- table reasonClassRelatedMethod/2 as incremental.
22552255
:- table reasonClassRelatedMethod_A/2 as incremental.
2256-
%:- table reasonClassRelatedMethod_B/2 as incremental.
2256+
:- table reasonClassRelatedMethod_B/2 as incremental.
22572257
:- table reasonClassRelatedMethod_C/2 as incremental.
22582258

22592259
reasonClassRelatedMethod(Class, Method) :-
22602260
reasonClassRelatedMethod_A(Class, Method);
22612261
% _B is now a trigger rule
2262-
%reasonClassRelatedMethod_B(Class, Method);
2262+
% Re-enabled (temporarily) for negation branch
2263+
reasonClassRelatedMethod_B(Class, Method);
22632264
reasonClassRelatedMethod_C(Class, Method).
22642265

22652266
% ClassCallsMethod => ClassRelatedMethod
@@ -2270,6 +2271,9 @@
22702271
thisPtrUsage(Function, ThisPtr, Method) :-
22712272
thisPtrUsage(_, Function, ThisPtr, Method).
22722273

2274+
reasonClassRelatedMethod_B(Class1, Method2) :-
2275+
reasonClassRelatedMethod_B(Class1, _, _, Method2).
2276+
22732277
% Because two methods are called on the same this-pointer in the same function. This rule is
22742278
% NOT direction safe, because it simply observes two methods being called on the same object
22752279
% pointer, and does not account for inheritance relationships.
@@ -2695,6 +2699,7 @@
26952699
% inverse rule under reasonNOTMergeClasses.
26962700
% PAPER: Merging-4
26972701
reasonMergeClasses_E(Class1, Class2) :-
2702+
fail,
26982703
factDerivedClass(DerivedClass, Class1, ObjectOffset),
26992704
factDerivedClass(DerivedClass, Class2, ObjectOffset),
27002705
iso_dif(Class1, Class2),

0 commit comments

Comments
 (0)