@eagleoutice/flowr 2.0.7 → 2.0.9

package/benchmark/stats/print.js

@@ -10,6 +10,9 @@ function formatNanoseconds(nanoseconds) {
     if (nanoseconds < 0) {
         return '??';
     }
+    else if (!Number.isFinite(nanoseconds)) {
+        return nanoseconds > 0 ? '∞' : '-∞';
+    }
     const wholeNanos = typeof nanoseconds === 'bigint' ? nanoseconds : BigInt(Math.round(nanoseconds));
     const nanos = wholeNanos % BigInt(1e+6);
     const wholeMillis = wholeNanos / BigInt(1e+6);
@@ -145,7 +148,21 @@ Dataflow:
 }
 exports.stats2string = stats2string;
 function ultimateStats2String(stats) {
-    // Used Slice Criteria Sizes:  ${formatSummarizedMeasure(stats.perSliceMeasurements.sliceCriteriaSizes)}
+    const slice = stats.totalSlices > 0 ? `Slice summary for:
+  Total:                              ${formatSummarizedTimeMeasure(stats.perSliceMeasurements.get('total'))}
+  Slice creation:                     ${formatSummarizedTimeMeasure(stats.perSliceMeasurements.get('static slicing'))}
+  Slice creation per token in slice:  ${formatSummarizedTimeMeasure(stats.sliceTimePerToken.normalized)}
+  Slice creation per R token in slice:${formatSummarizedTimeMeasure(stats.sliceTimePerToken.raw)}
+  Reconstruction:                     ${formatSummarizedTimeMeasure(stats.perSliceMeasurements.get('reconstruct code'))}
+  Reconstruction per token in slice:  ${formatSummarizedTimeMeasure(stats.reconstructTimePerToken.normalized)}
+  Reconstruction per R token in slice:${formatSummarizedTimeMeasure(stats.reconstructTimePerToken.raw)}
+  Total per token in slice:           ${formatSummarizedTimeMeasure(stats.totalPerSliceTimePerToken.normalized)}
+  Total per R token in slice:         ${formatSummarizedTimeMeasure(stats.totalPerSliceTimePerToken.raw)}
+  Failed to Re-Parse:                 ${pad(stats.failedToRepParse)}/${stats.totalSlices}
+  Times hit Threshold:                ${pad(stats.timesHitThreshold)}/${stats.totalSlices} 
+${reduction2String('Reductions', stats.reduction)}
+${reduction2String('Reductions without comments and empty lines', stats.reductionNoFluff)}` : 'No slices';
+    // Used Slice Criteria Sizes: ${formatSummarizedMeasure(stats.perSliceMeasurements.sliceCriteriaSizes)}
     return `
 Summarized: ${stats.totalRequests} requests and ${stats.totalSlices} slices
 Shell init time:              ${formatSummarizedTimeMeasure(stats.commonMeasurements.get('initialize R session'))}
@@ -161,20 +178,7 @@ Dataflow creation per R token:${formatSummarizedTimeMeasure(stats.dataflowTimePe
 Total common time per token:  ${formatSummarizedTimeMeasure(stats.totalCommonTimePerToken.normalized)}
 Total common time per R token:${formatSummarizedTimeMeasure(stats.totalCommonTimePerToken.raw)}
 
-Slice summary for:
-  Total:                              ${formatSummarizedTimeMeasure(stats.perSliceMeasurements.get('total'))}
-  Slice creation:                     ${formatSummarizedTimeMeasure(stats.perSliceMeasurements.get('static slicing'))}
-  Slice creation per token in slice:  ${formatSummarizedTimeMeasure(stats.sliceTimePerToken.normalized)}
-  Slice creation per R token in slice:${formatSummarizedTimeMeasure(stats.sliceTimePerToken.raw)}
-  Reconstruction:                     ${formatSummarizedTimeMeasure(stats.perSliceMeasurements.get('reconstruct code'))}
-  Reconstruction per token in slice:  ${formatSummarizedTimeMeasure(stats.reconstructTimePerToken.normalized)}
-  Reconstruction per R token in slice:${formatSummarizedTimeMeasure(stats.reconstructTimePerToken.raw)}
-  Total per token in slice:           ${formatSummarizedTimeMeasure(stats.totalPerSliceTimePerToken.normalized)}
-  Total per R token in slice:         ${formatSummarizedTimeMeasure(stats.totalPerSliceTimePerToken.raw)}
-  Failed to Re-Parse:                 ${pad(stats.failedToRepParse)}/${stats.totalSlices}
-  Times hit Threshold:                ${pad(stats.timesHitThreshold)}/${stats.totalSlices} 
-${reduction2String('Reductions', stats.reduction)}
-${reduction2String('Reductions without comments and empty lines', stats.reductionNoFluff)}
+${slice}
 
 Shell close:                  ${formatSummarizedTimeMeasure(stats.commonMeasurements.get('close R session'))}
 Total:                        ${formatSummarizedTimeMeasure(stats.commonMeasurements.get('total'))}

package/benchmark/stats/size-of.js

@@ -39,7 +39,7 @@ function getSizeOfDfGraph(df) {
                 ...vertex,
                 environment: {
                     ...vertex.environment,
-                    current: killBuiltInEnv(v.environment.current)
+                    current: killBuiltInEnv(v.environment?.current)
                 }
             };
         }

package/benchmark/summarizer/summarizer.js

@@ -21,20 +21,21 @@ class BenchmarkSummarizer extends summarizer_1.Summarizer {
     async preparationPhase() {
         this.removeIfExists(this.summaryFile());
         this.removeIfExists(this.config.intermediateOutputPath);
-        fs_1.default.mkdirSync(this.config.intermediateOutputPath);
-        const filesToSummarize = fs_1.default.readdirSync(this.config.inputPath);
+        fs_1.default.mkdirSync(this.config.intermediateOutputPath, { recursive: true });
+        let fileNum = 0;
         const outputPathsPerRun = new defaultmap_1.DefaultMap(() => []);
-        for (let i = 0; i < filesToSummarize.length; i++) {
-            const fileInputPath = path_1.default.join(this.config.inputPath, filesToSummarize[i]);
-            const outputDir = path_1.default.join(this.config.intermediateOutputPath, path_1.default.parse(filesToSummarize[i]).name);
-            fs_1.default.mkdirSync(outputDir);
+        // recursively find all files in all the input path subdirectories
+        for await (const file of (0, files_1.getAllFiles)(this.config.inputPath)) {
+            const outputDir = path_1.default.join(this.config.intermediateOutputPath, path_1.default.relative(this.config.inputPath, file));
+            fs_1.default.mkdirSync(outputDir, { recursive: true });
             const textOutputPath = path_1.default.join(outputDir, 'summary.log');
             // generate measurements for each run
-            await (0, files_1.readLineByLine)(fileInputPath, (line, lineNumber) => {
+            await (0, files_1.readLineByLine)(file, (line, lineNumber) => {
                 const runOutputPath = path_1.default.join(outputDir, `run-${lineNumber}.json`);
                 outputPathsPerRun.get(lineNumber).push(runOutputPath);
-                return (0, input_1.processRunMeasurement)(line, i, lineNumber, textOutputPath, runOutputPath);
+                return (0, input_1.processRunMeasurement)(line, fileNum, lineNumber, textOutputPath, runOutputPath);
             });
+            fileNum++;
         }
         // generate combined measurements for each file per run
         for (const [run, paths] of outputPathsPerRun.entries()) {

package/cli/benchmark-app.js

@@ -32,13 +32,15 @@ function removeIfExists(summarizedRaw) {
 }
 async function benchmark() {
     removeIfExists(options.output);
-    fs_1.default.mkdirSync(options.output);
+    fs_1.default.mkdirSync(options.output, { recursive: true });
     console.log(`Storing output in ${options.output}`);
     console.log(`Using ${options.parallel} parallel executors`);
     // we do not use the limit argument to be able to pick the limit randomly
     const files = [];
-    for await (const file of (0, files_1.allRFilesFrom)(options.input)) {
-        files.push(file);
+    for (const input of options.input) {
+        for await (const file of (0, files_1.allRFiles)(input)) {
+            files.push({ request: file, baseDir: input });
+        }
     }
     if (options.limit) {
         log_1.log.info(`limiting to ${options.limit} files`);
@@ -48,9 +50,9 @@ async function benchmark() {
     const limit = options.limit ?? files.length;
     const verboseAdd = options.verbose ? ['--verbose'] : [];
     const args = files.map((f, i) => [
-        '--input', f.content,
+        '--input', f.request.content,
         '--file-id', `${i}`,
-        '--output', path_1.default.join(options.output, `${path_1.default.parse(f.content).name}.json`),
+        '--output', path_1.default.join(options.output, path_1.default.relative(f.baseDir, `${f.request.content}.json`)),
         '--slice', options.slice, ...verboseAdd
     ]);
     const runs = options.runs ?? 1;

package/cli/benchmark-helper-app.js

@@ -10,6 +10,7 @@ const json_1 = require("../util/json");
 const script_1 = require("./common/script");
 const slicer_1 = require("../benchmark/slicer");
 const all_variables_1 = require("../slicing/criterion/filters/all-variables");
+const path_1 = __importDefault(require("path"));
 const options = (0, script_1.processCommandLineArgs)('benchmark-helper', [], {
     subtitle: 'Will slice for all possible variables, signal by exit code if slicing was successful, and can be run standalone',
     examples: [
@@ -30,6 +31,7 @@ async function benchmark() {
     // prefix for printing to console, includes file id and run number if present
     const prefix = `[${options.input}${options['file-id'] !== undefined ? ` (file ${options['file-id']}, run ${options['run-num']})` : ''}]`;
     console.log(`${prefix} Appending output to ${options.output}`);
+    fs_1.default.mkdirSync(path_1.default.parse(options.output).dir, { recursive: true });
     // ensure the file exists
     const fileStat = fs_1.default.statSync(options.input);
     (0, assert_1.guard)(fileStat.isFile(), `File ${options.input} does not exist or is no file`);
@@ -61,6 +63,7 @@ async function benchmark() {
             stats
         };
         // append line by line
+        console.log(`Appending benchmark of ${options.input} to ${options.output}`);
         fs_1.default.appendFileSync(options.output, `${JSON.stringify(output, json_1.jsonReplacer)}\n`);
     }
     catch (e) {

package/cli/repl/server/connection.d.ts

@@ -1,5 +1,8 @@
 import type { Socket } from './net';
+import { DEFAULT_SLICING_PIPELINE } from '../../../core/steps/pipeline/default-pipelines';
 import type { RShell } from '../../../r-bridge/shell';
+import type { PipelineOutput } from '../../../core/steps/pipeline/pipeline';
+import type { DeepPartial } from 'ts-essentials';
 /**
  * Each connection handles a single client, answering to its requests.
  * There is no need to construct this class manually, {@link FlowRServer} will do it for you.
@@ -19,3 +22,4 @@ export declare class FlowRServerConnection {
     private handleSliceRequest;
     private handleRepl;
 }
+export declare function sanitizeAnalysisResults(results: Partial<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>>): DeepPartial<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>>;

package/cli/repl/server/connection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlowRServerConnection = void 0;
+exports.sanitizeAnalysisResults = exports.FlowRServerConnection = void 0;
 const send_1 = require("./send");
 const validate_1 = require("./validate");
 const analysis_1 = require("./messages/analysis");
@@ -103,6 +103,7 @@ class FlowRServerConnection {
             cfg = (0, cfg_1.extractCFG)(results.normalize);
         }
         const config = () => ({ context: message.filename ?? 'unknown', getId: (0, quads_1.defaultQuadIdGenerator)() });
+        const sanitizedResults = sanitizeAnalysisResults(results);
         if (message.format === 'n-quads') {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'response-file-analysis',
@@ -110,9 +111,9 @@ class FlowRServerConnection {
                 id: message.id,
                 cfg: cfg ? (0, cfg_1.cfg2quads)(cfg, config()) : undefined,
                 results: {
-                    parse: await (0, print_1.printStepResult)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, results.parse, 5 /* StepOutputFormat.RdfQuads */, config()),
-                    normalize: await (0, print_1.printStepResult)(_10_normalize_1.NORMALIZE, results.normalize, 5 /* StepOutputFormat.RdfQuads */, config()),
-                    dataflow: await (0, print_1.printStepResult)(_20_dataflow_1.STATIC_DATAFLOW, results.dataflow, 5 /* StepOutputFormat.RdfQuads */, config())
+                    parse: await (0, print_1.printStepResult)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, sanitizedResults.parse, 5 /* StepOutputFormat.RdfQuads */, config()),
+                    normalize: await (0, print_1.printStepResult)(_10_normalize_1.NORMALIZE, sanitizedResults.normalize, 5 /* StepOutputFormat.RdfQuads */, config()),
+                    dataflow: await (0, print_1.printStepResult)(_20_dataflow_1.STATIC_DATAFLOW, sanitizedResults.dataflow, 5 /* StepOutputFormat.RdfQuads */, config())
                 }
             });
         }
@@ -122,13 +123,7 @@ class FlowRServerConnection {
                 format: 'json',
                 id: message.id,
                 cfg,
-                results: {
-                    ...results,
-                    normalize: {
-                        ...results.normalize,
-                        idMap: undefined
-                    }
-                }
+                results: sanitizedResults
             });
         }
     }
@@ -215,4 +210,23 @@ class FlowRServerConnection {
     }
 }
 exports.FlowRServerConnection = FlowRServerConnection;
+function sanitizeAnalysisResults(results) {
+    return {
+        ...results,
+        normalize: {
+            ...results.normalize,
+            idMap: undefined
+        },
+        dataflow: {
+            ...results.dataflow,
+            graph: {
+                ...results.dataflow?.graph,
+                functionCache: undefined,
+                // @ts-expect-error this is private, but we want to sanitize it for the purpose of json serialization
+                _idMap: undefined
+            }
+        }
+    };
+}
+exports.sanitizeAnalysisResults = sanitizeAnalysisResults;
 //# sourceMappingURL=connection.js.map

package/dataflow/environments/diff.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.diffEnvironmentInformation = exports.diffEnvironment = exports.diffIdentifierReferences = void 0;
 const diff_1 = require("../../util/diff");
+const environment_1 = require("./environment");
 const json_1 = require("../../util/json");
 const info_1 = require("../info");
 const built_in_1 = require("./built-in");
@@ -75,7 +76,7 @@ exports.diffEnvironment = diffEnvironment;
 function diffEnvironmentInformation(a, b, info) {
     if (a === undefined || b === undefined) {
         if (a !== b) {
-            info.report.addComment(`${info.position}Different environments: ${JSON.stringify(a, json_1.jsonReplacer)} vs. ${JSON.stringify(b, json_1.jsonReplacer)}`);
+            info.report.addComment(`${info.position}Different environments: ${JSON.stringify(a, environment_1.builtInEnvJsonReplacer)} vs. ${JSON.stringify(b, environment_1.builtInEnvJsonReplacer)}`);
         }
         return;
     }

package/dataflow/environments/environment.d.ts

@@ -12,7 +12,7 @@ export declare function makeAllMaybe(references: readonly IdentifierReference[]
 export type EnvironmentMemory = Map<Identifier, IdentifierDefinition[]>;
 export interface IEnvironment {
     /** unique and internally generated identifier -- will not be used for comparison but assists debugging for tracking identities */
-    readonly id: string;
+    readonly id: number;
     /** Lexical parent of the environment, if any (can be manipulated by R code) */
     parent: IEnvironment;
     /**
@@ -21,7 +21,7 @@ export interface IEnvironment {
     memory: EnvironmentMemory;
 }
 export declare class Environment implements IEnvironment {
-    readonly id: string;
+    readonly id: number;
     parent: IEnvironment;
     memory: Map<Identifier, IdentifierDefinition[]>;
     constructor(parent: IEnvironment);
@@ -41,3 +41,4 @@ export interface REnvironmentInformation {
 }
 export declare const BuiltInEnvironment: Environment;
 export declare function initializeCleanEnvironments(fullBuiltIns?: boolean): REnvironmentInformation;
+export declare function builtInEnvJsonReplacer(k: unknown, v: unknown): unknown;

package/dataflow/environments/environment.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeCleanEnvironments = exports.BuiltInEnvironment = exports.Environment = exports.makeAllMaybe = exports.makeReferenceMaybe = void 0;
+exports.builtInEnvJsonReplacer = exports.initializeCleanEnvironments = exports.BuiltInEnvironment = exports.Environment = exports.makeAllMaybe = exports.makeReferenceMaybe = void 0;
 const built_in_1 = require("./built-in");
 const resolve_by_name_1 = require("./resolve-by-name");
+const json_1 = require("../../util/json");
 function makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd = undefined) {
     const node = graph.get(ref.nodeId, true);
     if (includeDefs) {
@@ -38,7 +39,7 @@ function makeAllMaybe(references, graph, environments, includeDefs, defaultCd =
 exports.makeAllMaybe = makeAllMaybe;
 let environmentIdCounter = 0;
 class Environment {
-    id = `${environmentIdCounter++}`;
+    id = environmentIdCounter++;
     parent;
     memory;
     constructor(parent) {
@@ -64,4 +65,16 @@ function initializeCleanEnvironments(fullBuiltIns = true) {
     };
 }
 exports.initializeCleanEnvironments = initializeCleanEnvironments;
+function builtInEnvJsonReplacer(k, v) {
+    if (v === exports.BuiltInEnvironment) {
+        return '<BuiltInEnvironment>';
+    }
+    else if (v === EmptyBuiltInEnvironment) {
+        return '<EmptyBuiltInEnvironment>';
+    }
+    else {
+        return (0, json_1.jsonReplacer)(k, v);
+    }
+}
+exports.builtInEnvJsonReplacer = builtInEnvJsonReplacer;
 //# sourceMappingURL=environment.js.map

package/dataflow/graph/graph.d.ts

@@ -47,6 +47,7 @@ type EdgeData<Edge extends DataflowGraphEdge> = Omit<Edge, 'from' | 'to' | 'type
 export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = DataflowGraphVertexInfo, Edge extends DataflowGraphEdge = DataflowGraphEdge> {
     private static DEFAULT_ENVIRONMENT;
     private _idMap;
+    readonly functionCache: Map<NodeId, Set<DataflowGraphVertexInfo>>;
     constructor(idMap: AstIdMap | undefined);
     /** Contains the vertices of the root level graph (i.e., included those vertices from the complete graph, that are nested within function definitions) */
     private rootVertices;

package/dataflow/graph/graph.js

@@ -42,6 +42,8 @@ function extractEdgeIds(from, to) {
 class DataflowGraph {
     static DEFAULT_ENVIRONMENT = undefined;
     _idMap;
+    // this should be linked separately
+    functionCache = new Map();
     constructor(idMap) {
         DataflowGraph.DEFAULT_ENVIRONMENT ??= (0, environment_1.initializeCleanEnvironments)();
         this._idMap = idMap;
@@ -155,7 +157,7 @@ class DataflowGraph {
         if (oldVertex !== undefined) {
             return this;
         }
-        const fallback = vertex.tag === "variable-definition" /* VertexType.VariableDefinition */ || vertex.tag === "use" /* VertexType.Use */ || vertex.tag === "value" /* VertexType.Value */ ? undefined : DataflowGraph.DEFAULT_ENVIRONMENT;
+        const fallback = vertex.tag === "variable-definition" /* VertexType.VariableDefinition */ || vertex.tag === "use" /* VertexType.Use */ || vertex.tag === "value" /* VertexType.Value */ || (vertex.tag === "function-call" /* VertexType.FunctionCall */ && vertex.onlyBuiltin) ? undefined : DataflowGraph.DEFAULT_ENVIRONMENT;
         // keep a clone of the original environment
         const environment = vertex.environment === undefined ? fallback : (0, clone_1.cloneEnvironmentInformation)(vertex.environment);
         this.vertexInformation.set(vertex.id, {

package/dataflow/graph/vertex.d.ts

@@ -62,7 +62,7 @@ export interface DataflowGraphVertexFunctionCall extends DataflowGraphVertexBase
     args: FunctionArgument[];
     /** a performance flag to indicate that the respective call is _only_ calling a builtin function without any df graph attached */
     onlyBuiltin: boolean;
-    readonly environment: REnvironmentInformation;
+    environment: REnvironmentInformation | undefined;
 }
 /**
  * Arguments required to construct a vertex which represents the definition of a variable in the dataflow graph.

package/dataflow/internal/linker.d.ts

@@ -17,7 +17,7 @@ export declare function linkFunctionCalls(graph: DataflowGraph, idMap: AstIdMap,
     functionCall: NodeId;
     called: readonly DataflowGraphVertexInfo[];
 }[];
-export declare function getAllLinkedFunctionDefinitions(functionDefinitionReadIds: ReadonlySet<NodeId>, dataflowGraph: DataflowGraph): Map<NodeId, DataflowGraphVertexInfo>;
+export declare function getAllLinkedFunctionDefinitions(functionDefinitionReadIds: ReadonlySet<NodeId>, dataflowGraph: DataflowGraph): Set<DataflowGraphVertexInfo>;
 /**
  * This method links a set of read variables to definitions in an environment.
  *

package/dataflow/internal/linker.js

@@ -133,7 +133,7 @@ exports.linkFunctionCalls = linkFunctionCalls;
 function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGraph) {
     const potential = [...functionDefinitionReadIds];
     const visited = new Set();
-    const result = new Map();
+    const result = new Set();
     while (potential.length > 0) {
         const currentId = potential.pop();
         // do not traverse builtins
@@ -156,7 +156,7 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
         const followBits = 1 /* EdgeType.Reads */ | 2 /* EdgeType.DefinedBy */ | 32 /* EdgeType.DefinedByOnCall */;
         const followEdges = outgoingEdges.filter(([_, e]) => (0, edge_1.edgeIncludesType)(e.types, followBits));
         if (currentInfo[0].subflow !== undefined) {
-            result.set(currentId, currentInfo[0]);
+            result.add(currentInfo[0]);
         }
         // trace all joined reads
         potential.push(...followEdges.map(([target]) => target).filter(id => !visited.has(id)));

package/dataflow/internal/process/functions/call/named-call-handling.js

@@ -45,6 +45,7 @@ function processNamedCall(name, args, rootId, data) {
         const v = information.graph.getVertex(rootId);
         if (v?.tag === "function-call" /* VertexType.FunctionCall */) {
             v.onlyBuiltin = true;
+            v.environment = undefined;
         }
     }
     return information ?? (0, info_1.initializeCleanDataflowInformation)(rootId, data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/slicing/static/slice-call.js

@@ -4,6 +4,7 @@ exports.handleReturns = exports.sliceForCall = void 0;
 const assert_1 = require("../../util/assert");
 const fingerprint_1 = require("./fingerprint");
 const linker_1 = require("../../dataflow/internal/linker");
+const environment_1 = require("../../dataflow/environments/environment");
 const scoping_1 = require("../../dataflow/environments/scoping");
 const overwrite_1 = require("../../dataflow/environments/overwrite");
 const built_in_1 = require("../../dataflow/environments/built-in");
@@ -11,12 +12,13 @@ const resolve_by_name_1 = require("../../dataflow/environments/resolve-by-name")
 const edge_1 = require("../../dataflow/graph/edge");
 function retrieveActiveEnvironment(callerInfo, baseEnvironment) {
     let callerEnvironment = callerInfo.environment;
-    if (baseEnvironment.level !== callerEnvironment.level) {
-        while (baseEnvironment.level < callerEnvironment.level) {
+    const level = callerEnvironment?.level ?? 0;
+    if (baseEnvironment.level !== level) {
+        while (baseEnvironment.level < level) {
             baseEnvironment = (0, scoping_1.pushLocalEnvironment)(baseEnvironment);
         }
-        while (baseEnvironment.level > callerEnvironment.level) {
-            callerEnvironment = (0, scoping_1.pushLocalEnvironment)(callerEnvironment);
+        while (baseEnvironment.level > level) {
+            callerEnvironment = (0, scoping_1.pushLocalEnvironment)(callerEnvironment ?? (0, environment_1.initializeCleanEnvironments)(true));
         }
     }
     return (0, overwrite_1.overwriteEnvironment)(baseEnvironment, callerEnvironment);
@@ -40,7 +42,7 @@ function sliceForCall(current, callerInfo, dataflowGraph, queue) {
         }
     }
     const functionCallTargets = (0, linker_1.getAllLinkedFunctionDefinitions)(new Set(functionCallDefs), dataflowGraph);
-    for (const [_, functionCallTarget] of functionCallTargets) {
+    for (const functionCallTarget of functionCallTargets) {
         // all those linked within the scopes of other functions are already linked when exiting a function definition
         for (const openIn of functionCallTarget.subflow.in) {
             const defs = openIn.name ? (0, resolve_by_name_1.resolveByName)(openIn.name, activeEnvironment) : undefined;
@@ -72,7 +74,11 @@ function handleReturns(queue, currentEdges, baseEnvFingerprint, baseEnvironment)
             queue.add(target, baseEnvironment, baseEnvFingerprint, false);
         }
         else if ((0, edge_1.edgeIncludesType)(edge.types, 64 /* EdgeType.Argument */)) {
-            queue.potentialArguments.add(target);
+            queue.potentialArguments.set(target, {
+                id: target,
+                baseEnvironment,
+                onlyForSideEffects: false
+            });
         }
     }
     return true;

package/slicing/static/static-slicer.js

@@ -9,7 +9,6 @@ const slice_call_1 = require("./slice-call");
 const parse_1 = require("../criterion/parse");
 const environment_1 = require("../../dataflow/environments/environment");
 const edge_1 = require("../../dataflow/graph/edge");
-const built_in_1 = require("../../dataflow/environments/built-in");
 exports.slicerLogger = log_1.log.getSubLogger({ name: 'slicer' });
 /**
  * This returns the ids to include in the slice, when slicing with the given seed id's (must be at least one).
@@ -63,16 +62,19 @@ function staticSlicing(graph, ast, criteria, threshold = 75) {
             }
         }
         for (const [target, { types }] of currentEdges) {
-            if (target === built_in_1.BuiltIn || (0, edge_1.edgeIncludesType)(types, 256 /* EdgeType.NonStandardEvaluation */)) {
+            if ((0, edge_1.edgeIncludesType)(types, 256 /* EdgeType.NonStandardEvaluation */)) {
                 continue;
             }
             const t = (0, edge_1.shouldTraverseEdge)(types);
             if (t === 3 /* TraverseEdge.Always */) {
                 queue.add(target, baseEnvironment, baseEnvFingerprint, false);
             }
-            else if (t === 2 /* TraverseEdge.DefinedByOnCall */ && queue.potentialArguments.has(target)) {
-                queue.add(target, baseEnvironment, baseEnvFingerprint, false);
-                queue.potentialArguments.delete(target);
+            else if (t === 2 /* TraverseEdge.DefinedByOnCall */) {
+                const n = queue.potentialArguments.get(target);
+                if (n) {
+                    queue.add(target, n.baseEnvironment, (0, fingerprint_1.envFingerprint)(n.baseEnvironment), n.onlyForSideEffects);
+                    queue.potentialArguments.delete(target);
+                }
             }
             else if (t === 1 /* TraverseEdge.SideEffect */) {
                 queue.add(target, baseEnvironment, baseEnvFingerprint, true);

package/slicing/static/visiting-queue.d.ts

@@ -7,7 +7,7 @@ export declare class VisitingQueue {
     private seen;
     private idThreshold;
     private queue;
-    potentialArguments: Set<NodeId>;
+    potentialArguments: Map<NodeId, NodeToSlice>;
     constructor(threshold: number);
     /**
      * Adds a node to the queue if it has not been seen before.

package/slicing/static/visiting-queue.js

@@ -10,7 +10,7 @@ class VisitingQueue {
     idThreshold = new Map();
     queue = [];
     // the set of potential arguments holds arguments which may be added if found with the `defined-by-on-call` edge
-    potentialArguments = new Set();
+    potentialArguments = new Map();
     constructor(threshold) {
         this.threshold = threshold;
     }

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = void 0;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.0.7';
+const version = '2.0.9';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }