@@ -523,58 +523,6 @@ abstract class LabeledBarrierGuardNode extends BarrierGuardNode {
523523 override predicate blocks ( boolean outcome , Expr e ) { none ( ) }
524524}
525525
526- // Internal version of AdditionalFlowStep that we can reference without deprecation warnings.
527- abstract private class LegacyAdditionalFlowStep extends DataFlow:: Node {
528- /**
529- * Holds if `pred` → `succ` should be considered a data flow edge.
530- */
531- predicate step ( DataFlow:: Node pred , DataFlow:: Node succ ) { none ( ) }
532-
533- /**
534- * Holds if `pred` → `succ` should be considered a data flow edge
535- * transforming values with label `predlbl` to have label `succlbl`.
536- */
537- predicate step (
538- DataFlow:: Node pred , DataFlow:: Node succ , DataFlow:: FlowLabel predlbl ,
539- DataFlow:: FlowLabel succlbl
540- ) {
541- none ( )
542- }
543-
544- /**
545- * EXPERIMENTAL. This API may change in the future.
546- *
547- * Holds if `pred` should be stored in the object `succ` under the property `prop`.
548- * The object `succ` must be a `DataFlow::SourceNode` for the object wherein the value is stored.
549- */
550- predicate storeStep ( DataFlow:: Node pred , DataFlow:: SourceNode succ , string prop ) { none ( ) }
551-
552- /**
553- * EXPERIMENTAL. This API may change in the future.
554- *
555- * Holds if the property `prop` of the object `pred` should be loaded into `succ`.
556- */
557- predicate loadStep ( DataFlow:: Node pred , DataFlow:: Node succ , string prop ) { none ( ) }
558-
559- /**
560- * EXPERIMENTAL. This API may change in the future.
561- *
562- * Holds if the property `prop` should be copied from the object `pred` to the object `succ`.
563- */
564- predicate loadStoreStep ( DataFlow:: Node pred , DataFlow:: Node succ , string prop ) { none ( ) }
565-
566- /**
567- * EXPERIMENTAL. This API may change in the future.
568- *
569- * Holds if the property `loadProp` should be copied from the object `pred` to the property `storeProp` of object `succ`.
570- */
571- predicate loadStoreStep (
572- DataFlow:: Node pred , DataFlow:: Node succ , string loadProp , string storeProp
573- ) {
574- none ( )
575- }
576- }
577-
578526/**
579527 * A data flow edge that should be added to all data flow configurations in
580528 * addition to standard data flow edges.
@@ -697,40 +645,6 @@ module SharedFlowStep {
697645 }
698646}
699647
700- /**
701- * Contributes subclasses of `AdditionalFlowStep` to `SharedFlowStep`.
702- */
703- private class AdditionalFlowStepAsSharedStep extends SharedFlowStep {
704- override predicate step ( DataFlow:: Node pred , DataFlow:: Node succ ) {
705- any ( LegacyAdditionalFlowStep s ) .step ( pred , succ )
706- }
707-
708- override predicate step (
709- DataFlow:: Node pred , DataFlow:: Node succ , DataFlow:: FlowLabel predlbl ,
710- DataFlow:: FlowLabel succlbl
711- ) {
712- any ( LegacyAdditionalFlowStep s ) .step ( pred , succ , predlbl , succlbl )
713- }
714-
715- override predicate storeStep ( DataFlow:: Node pred , DataFlow:: SourceNode succ , string prop ) {
716- any ( LegacyAdditionalFlowStep s ) .storeStep ( pred , succ , prop )
717- }
718-
719- override predicate loadStep ( DataFlow:: Node pred , DataFlow:: Node succ , string prop ) {
720- any ( LegacyAdditionalFlowStep s ) .loadStep ( pred , succ , prop )
721- }
722-
723- override predicate loadStoreStep ( DataFlow:: Node pred , DataFlow:: Node succ , string prop ) {
724- any ( LegacyAdditionalFlowStep s ) .loadStoreStep ( pred , succ , prop )
725- }
726-
727- override predicate loadStoreStep (
728- DataFlow:: Node pred , DataFlow:: Node succ , string loadProp , string storeProp
729- ) {
730- any ( LegacyAdditionalFlowStep s ) .loadStoreStep ( pred , succ , loadProp , storeProp )
731- }
732- }
733-
734648/**
735649 * A collection of pseudo-properties that are used in multiple files.
736650 *
0 commit comments