Dataflow: Use (node,state) pair as node type in stage 2+.

Author: aschackmull

shared/dataflow/codeql/dataflow/DataFlow.qll

@@ -734,7 +734,7 @@ module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
 
     import Stage1::PartialFlow
 
-    private module Flow = Impl<C, Stage1::Stage1NoState>;
+    private module Flow = Impl<C, Stage1::Stage1WithState>;
 
     import Flow
   }

shared/dataflow/codeql/dataflow/TaintTracking.qll

@@ -134,7 +134,7 @@ module TaintFlowMake<
 
     import Stage1::PartialFlow
 
-    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1NoState>;
+    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1WithState>;
 
     import Flow
   }
@@ -236,7 +236,7 @@ module TaintFlowMake<
 
     import Stage1::PartialFlow
 
-    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1NoState>;
+    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1WithState>;
 
     import Flow
   }
@@ -274,7 +274,7 @@ module TaintFlowMake<
 
     import Stage1::PartialFlow
 
-    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1NoState>;
+    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1WithState>;
 
     import Flow
   }