arkanalyzer 1.0.29 → 1.0.31

package/lib/transformer/StaticSingleAssignmentFormer.js

@@ -22,25 +22,13 @@ const DominanceFinder_1 = require("../core/graph/DominanceFinder");
 const DominanceTree_1 = require("../core/graph/DominanceTree");
 class StaticSingleAssignmentFormer {
     transformBody(body) {
-        var _a;
         let cfg = body.getCfg();
         let blockToDefs = new Map();
         let localToBlocks = new Map();
         for (const block of cfg.getBlocks()) {
             let defs = new Set();
             for (const stmt of block.getStmts()) {
-                if (stmt.getDef() != null && stmt.getDef() instanceof Local_1.Local) {
-                    let local = stmt.getDef();
-                    defs.add(local);
-                    if (localToBlocks.has(local)) {
-                        (_a = localToBlocks.get(local)) === null || _a === void 0 ? void 0 : _a.add(block);
-                    }
-                    else {
-                        let blcoks = new Set();
-                        blcoks.add(block);
-                        localToBlocks.set(local, blcoks);
-                    }
-                }
+                this.transformStmt(stmt, defs, localToBlocks, block);
             }
             blockToDefs.set(block, defs);
         }
@@ -50,8 +38,22 @@ class StaticSingleAssignmentFormer {
         let dominanceTree = new DominanceTree_1.DominanceTree(dominanceFinder);
         this.renameLocals(body, dominanceTree, blockToPhiStmts);
     }
+    transformStmt(stmt, defs, localToBlocks, block) {
+        var _a;
+        if (stmt.getDef() != null && stmt.getDef() instanceof Local_1.Local) {
+            let local = stmt.getDef();
+            defs.add(local);
+            if (localToBlocks.has(local)) {
+                (_a = localToBlocks.get(local)) === null || _a === void 0 ? void 0 : _a.add(block);
+            }
+            else {
+                let blcoks = new Set();
+                blcoks.add(block);
+                localToBlocks.set(local, blcoks);
+            }
+        }
+    }
     decideBlockToPhiStmts(body, dominanceFinder, blockToDefs, localToBlocks) {
-        var _a, _b, _c, _d;
         let blockToPhiStmts = new Map();
         let blockToPhiLocals = new Map();
         let localToPhiBlock = new Map();
@@ -63,50 +65,57 @@ class StaticSingleAssignmentFormer {
                 let block = blocks.splice(0, 1).at(0);
                 let dfs = dominanceFinder.getDominanceFrontiers(block);
                 for (const df of dfs) {
-                    if (!phiBlocks.has(df)) {
-                        phiBlocks.add(df);
-                        let phiStmt = this.createEmptyPhiStmt(local);
-                        if (blockToPhiStmts.has(df)) {
-                            (_a = blockToPhiStmts.get(df)) === null || _a === void 0 ? void 0 : _a.add(phiStmt);
-                            (_b = blockToPhiLocals.get(df)) === null || _b === void 0 ? void 0 : _b.add(local);
-                        }
-                        else {
-                            let phiStmts = new Set();
-                            phiStmts.add(phiStmt);
-                            blockToPhiStmts.set(df, phiStmts);
-                            let phiLocals = new Set();
-                            phiLocals.add(local);
-                            blockToPhiLocals.set(df, phiLocals);
-                        }
-                        (_c = blockToDefs.get(df)) === null || _c === void 0 ? void 0 : _c.add(local);
-                        if (!((_d = blockToDefs.get(df)) === null || _d === void 0 ? void 0 : _d.has(local))) {
-                            blocks.push(df);
-                        }
-                    }
+                    this.handleDf(blockToPhiStmts, blockToPhiLocals, phiBlocks, df, local, blockToDefs, blocks);
                 }
             }
         }
         return blockToPhiStmts;
     }
-    addPhiStmts(blockToPhiStmts, cfg, blockToDefs) {
+    handleDf(blockToPhiStmts, blockToPhiLocals, phiBlocks, df, local, blockToDefs, blocks) {
+        var _a, _b, _c, _d;
+        if (!phiBlocks.has(df)) {
+            phiBlocks.add(df);
+            let phiStmt = this.createEmptyPhiStmt(local);
+            if (blockToPhiStmts.has(df)) {
+                (_a = blockToPhiStmts.get(df)) === null || _a === void 0 ? void 0 : _a.add(phiStmt);
+                (_b = blockToPhiLocals.get(df)) === null || _b === void 0 ? void 0 : _b.add(local);
+            }
+            else {
+                let phiStmts = new Set();
+                phiStmts.add(phiStmt);
+                blockToPhiStmts.set(df, phiStmts);
+                let phiLocals = new Set();
+                phiLocals.add(local);
+                blockToPhiLocals.set(df, phiLocals);
+            }
+            (_c = blockToDefs.get(df)) === null || _c === void 0 ? void 0 : _c.add(local);
+            if (!((_d = blockToDefs.get(df)) === null || _d === void 0 ? void 0 : _d.has(local))) {
+                blocks.push(df);
+            }
+        }
+    }
+    handleBlockWithSucc(blockToPhiStmts, succ, blockToDefs, block, phiArgsNum) {
         var _a;
+        for (const phi of blockToPhiStmts.get(succ)) {
+            let local = phi.getDef();
+            if ((_a = blockToDefs.get(block)) === null || _a === void 0 ? void 0 : _a.has(local)) {
+                if (phiArgsNum.has(phi)) {
+                    let num = phiArgsNum.get(phi);
+                    phiArgsNum.set(phi, num + 1);
+                }
+                else {
+                    phiArgsNum.set(phi, 1);
+                }
+            }
+        }
+    }
+    addPhiStmts(blockToPhiStmts, cfg, blockToDefs) {
         let phiArgsNum = new Map();
         for (const block of cfg.getBlocks()) {
             let succs = Array.from(block.getSuccessors());
             for (const succ of succs) {
                 if (blockToPhiStmts.has(succ)) {
-                    for (const phi of blockToPhiStmts.get(succ)) {
-                        let local = phi.getDef();
-                        if ((_a = blockToDefs.get(block)) === null || _a === void 0 ? void 0 : _a.has(local)) {
-                            if (phiArgsNum.has(phi)) {
-                                let num = phiArgsNum.get(phi);
-                                phiArgsNum.set(phi, num + 1);
-                            }
-                            else {
-                                phiArgsNum.set(phi, 1);
-                            }
-                        }
-                    }
+                    this.handleBlockWithSucc(blockToPhiStmts, succ, blockToDefs, block, phiArgsNum);
                 }
             }
         }
@@ -123,8 +132,35 @@ class StaticSingleAssignmentFormer {
             }
         }
     }
+    renameUseAndDef(stmt, localToNameStack, nextFreeIdx, newLocals, newPhiStmts) {
+        var _a;
+        let uses = stmt.getUses();
+        if (uses.length > 0 && !this.constainsPhiExpr(stmt)) {
+            for (const use of uses) {
+                if (use instanceof Local_1.Local) {
+                    let nameStack = localToNameStack.get(use);
+                    let newUse = nameStack[nameStack.length - 1];
+                    stmt.replaceUse(use, newUse);
+                }
+            }
+        }
+        // rename def
+        let def = stmt.getDef();
+        if (def != null && def instanceof Local_1.Local) {
+            let newName = def.getName() + '#' + nextFreeIdx;
+            nextFreeIdx++;
+            let newDef = new Local_1.Local(newName);
+            newDef.setOriginalValue(def);
+            newLocals.add(newDef);
+            (_a = localToNameStack.get(def)) === null || _a === void 0 ? void 0 : _a.push(newDef);
+            stmt.setLeftOp(newDef);
+            if (this.constainsPhiExpr(stmt)) {
+                newPhiStmts.add(stmt);
+            }
+        }
+        return nextFreeIdx;
+    }
     renameLocals(body, dominanceTree, blockToPhiStmts) {
-        var _a, _b;
         let newLocals = new Set(body.getLocals().values());
         let localToNameStack = new Map();
         for (const local of newLocals) {
@@ -137,31 +173,8 @@ class StaticSingleAssignmentFormer {
         for (const block of dfsBlocks) {
             let newPhiStmts = new Set();
             for (const stmt of block.getStmts()) {
-                // rename uses
-                let uses = stmt.getUses();
-                if (uses.length > 0 && !this.constainsPhiExpr(stmt)) {
-                    for (const use of uses) {
-                        if (use instanceof Local_1.Local) {
-                            let nameStack = localToNameStack.get(use);
-                            let newUse = nameStack[nameStack.length - 1];
-                            stmt.replaceUse(use, newUse);
-                        }
-                    }
-                }
-                // rename def
-                let def = stmt.getDef();
-                if (def != null && def instanceof Local_1.Local) {
-                    let newName = def.getName() + '#' + nextFreeIdx;
-                    nextFreeIdx++;
-                    let newDef = new Local_1.Local(newName);
-                    newDef.setOriginalValue(def);
-                    newLocals.add(newDef);
-                    (_a = localToNameStack.get(def)) === null || _a === void 0 ? void 0 : _a.push(newDef);
-                    stmt.setLeftOp(newDef);
-                    if (this.constainsPhiExpr(stmt)) {
-                        newPhiStmts.add(stmt);
-                    }
-                }
+                // rename uses and def
+                nextFreeIdx = this.renameUseAndDef(stmt, localToNameStack, nextFreeIdx, newLocals, newPhiStmts);
             }
             visited.add(block);
             blockStack.push(block);
@@ -171,40 +184,45 @@ class StaticSingleAssignmentFormer {
             // rename phiStmts' args
             let succs = Array.from(block.getSuccessors());
             for (const succ of succs) {
-                if (blockToPhiStmts.has(succ)) {
-                    let phiStmts = blockToPhiStmts.get(succ);
-                    for (const phiStmt of phiStmts) {
-                        let def = phiStmt.getDef();
-                        let oriDef = this.getOriginalLocal(def, new Set(localToNameStack.keys()));
-                        let nameStack = localToNameStack.get(oriDef);
-                        let arg = nameStack[nameStack.length - 1];
-                        this.addNewArgToPhi(phiStmt, arg, block);
-                    }
+                if (!blockToPhiStmts.has(succ)) {
+                    continue;
+                }
+                let phiStmts = blockToPhiStmts.get(succ);
+                for (const phiStmt of phiStmts) {
+                    let def = phiStmt.getDef();
+                    let oriDef = this.getOriginalLocal(def, new Set(localToNameStack.keys()));
+                    let nameStack = localToNameStack.get(oriDef);
+                    let arg = nameStack[nameStack.length - 1];
+                    this.addNewArgToPhi(phiStmt, arg, block);
                 }
             }
             // if a block's children in dominance tree are visited, remove it
-            let top = blockStack[blockStack.length - 1];
-            let children = dominanceTree.getChildren(top);
-            while (this.containsAllChildren(visited, children)) {
-                blockStack.pop();
-                for (const stmt of top.getStmts()) {
-                    let def = stmt.getDef();
-                    if (def != null && def instanceof Local_1.Local) {
-                        let oriDef = this.getOriginalLocal(def, new Set(localToNameStack.keys()));
-                        (_b = localToNameStack.get(oriDef)) === null || _b === void 0 ? void 0 : _b.pop();
-                    }
-                }
-                // next block to check
-                if (blockStack.length > 0) {
-                    top = blockStack[blockStack.length - 1];
-                    children = dominanceTree.getChildren(top);
-                }
-                else {
-                    break;
+            this.removeVisitedTree(blockStack, dominanceTree, visited, localToNameStack);
+        }
+        body.setLocals(newLocals);
+    }
+    removeVisitedTree(blockStack, dominanceTree, visited, localToNameStack) {
+        var _a;
+        let top = blockStack[blockStack.length - 1];
+        let children = dominanceTree.getChildren(top);
+        while (this.containsAllChildren(visited, children)) {
+            blockStack.pop();
+            for (const stmt of top.getStmts()) {
+                let def = stmt.getDef();
+                if (def != null && def instanceof Local_1.Local) {
+                    let oriDef = this.getOriginalLocal(def, new Set(localToNameStack.keys()));
+                    (_a = localToNameStack.get(oriDef)) === null || _a === void 0 ? void 0 : _a.pop();
                 }
             }
+            // next block to check
+            if (blockStack.length > 0) {
+                top = blockStack[blockStack.length - 1];
+                children = dominanceTree.getChildren(top);
+            }
+            else {
+                break;
+            }
         }
-        body.setLocals(newLocals);
     }
     constainsPhiExpr(stmt) {
         if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getUses().length > 0) {

package/lib/utils/CfgStructualAnalysis.d.ts

@@ -32,6 +32,7 @@ export declare class AbstractFlowGraph {
     private structuralAnalysis;
     private dfsPostOrder;
     private buildCyclicStructural;
+    private handleRegion;
     private prepareBuildLoops;
     private buildDominator;
     private getBackEdges;

package/lib/utils/CfgStructualAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CfgStructualAnalysis.d.ts","sourceRoot":"","sources":["../../src/utils/CfgStructualAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,oBAAY,aAAa;IACrB,MAAM,IAAA;IACN,EAAE,IAAA;IACF,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,QAAQ,IAAA;IACR,EAAE,IAAA;IACF,QAAQ,IAAA;IACR,KAAK,IAAA;IACL,GAAG,IAAA;IACH,YAAY,IAAA;IACZ,GAAG,KAAA;IACH,KAAK,KAAA;IACL,OAAO,KAAA;CACV;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;AAE7F,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,QAAQ,CAAwC;IACxD,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,YAAY,CAAmD;IACvE,OAAO,CAAC,OAAO,CAAmD;gBAEtD,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;IA0B7B,QAAQ,IAAI,YAAY;IAIxB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAM7C,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,GAAE,GAAG,CAAC,YAAY,CAAa;IAUvG,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,iBAAiB;IA6BzB,OAAO,CAAC,cAAc;IA+BtB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,aAAa;IAwDrB,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,kBAAkB;IAmE1B,OAAO,CAAC,gBAAgB;IAwCxB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,YAAY;IAuCpB,OAAO,CAAC,MAAM;IAqBd,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,SAAS;IA4CjB,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,GAAG;IAiBX,OAAO,CAAC,oBAAoB;IAoB5B,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,uBAAuB;IAkB/B,OAAO,CAAC,0BAA0B;CAiBrC;AAED,aAAK,UAAU;IACX,aAAa,IAAA;IACb,QAAQ,IAAA;IACR,UAAU,IAAA;IACV,YAAY,IAAA;IAEZ,YAAY,IAAA;IACZ,SAAS,IAAA;IACT,cAAc,IAAA;IACd,mBAAmB,IAAA;IACnB,oBAAoB,IAAA;IACpB,uBAAuB,IAAA;IACvB,gBAAgB,KAAA;IAChB,mBAAmB,KAAA;IACnB,iBAAiB,KAAA;IACjB,oBAAoB,KAAA;IACpB,eAAe,KAAA;IACf,WAAW,KAAA;IACX,aAAa,KAAA;IACb,gBAAgB,KAAA;IAChB,kBAAkB,KAAA;IAClB,wBAAwB,KAAA;CAC3B;AAUD,cAAM,YAAY;IACd,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,EAAE,CAAyB;;IAM5B,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,aAAa;IAI1D,OAAO,IAAI,UAAU;IAIrB,OAAO,IAAI,YAAY,EAAE;IAIzB,OAAO,CAAC,IAAI,EAAE,YAAY;IAI1B,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY;IAShD,UAAU,CAAC,GAAG,EAAE,YAAY;IAS5B,OAAO,IAAI,YAAY,EAAE;IAIzB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAQlC,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY;IAShD,UAAU,CAAC,GAAG,EAAE,YAAY;IAS5B,QAAQ,CAAC,EAAE,EAAE,UAAU;IAIvB,QAAQ,IAAI,UAAU,GAAG,SAAS;IAIlC,SAAS,IAAI,OAAO;IAapB,aAAa,IAAI,OAAO;CAWlC"}
+{"version":3,"file":"CfgStructualAnalysis.d.ts","sourceRoot":"","sources":["../../src/utils/CfgStructualAnalysis.ts"],"names":[],"mappings":"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"}

package/lib/utils/CfgStructualAnalysis.js

@@ -145,22 +145,25 @@ class AbstractFlowGraph {
             this.structTypes.set(region, rtype);
             let blocks = new Set();
             for (const s of nset) {
-                if (!this.structOf.has(s)) {
-                    this.structOf.set(s, region);
-                }
-                if (this.structBlocks.has(s)) {
-                    for (const b of this.structBlocks.get(s)) {
-                        blocks.add(b);
-                    }
-                }
-                else {
-                    blocks.add(s);
-                }
+                this.handleRegion(s, region, blocks);
             }
             this.structBlocks.set(region, blocks);
             this.loopMap.set(region.header, region);
         }
     }
+    handleRegion(s, region, blocks) {
+        if (!this.structOf.has(s)) {
+            this.structOf.set(s, region);
+        }
+        if (this.structBlocks.has(s)) {
+            for (const b of this.structBlocks.get(s)) {
+                blocks.add(b);
+            }
+        }
+        else {
+            blocks.add(s);
+        }
+    }
     prepareBuildLoops() {
         let dom = this.buildDominator();
         let loops = [];
@@ -590,22 +593,23 @@ class AbstractFlowGraph {
     reduce(rtype, nodeSet) {
         let region = this.createRegion(rtype, nodeSet);
         region === null || region === void 0 ? void 0 : region.replace();
-        if (region) {
-            this.structTypes.set(region, rtype);
-            let blocks = new Set();
-            for (const s of nodeSet) {
-                this.structOf.set(s, region);
-                if (this.structBlocks.has(s)) {
-                    for (const b of this.structBlocks.get(s)) {
-                        blocks.add(b);
-                    }
-                }
-                else {
-                    blocks.add(s);
+        if (region === undefined) {
+            return undefined;
+        }
+        this.structTypes.set(region, rtype);
+        let blocks = new Set();
+        for (const s of nodeSet) {
+            this.structOf.set(s, region);
+            if (this.structBlocks.has(s)) {
+                for (const b of this.structBlocks.get(s)) {
+                    blocks.add(b);
                 }
             }
-            this.structBlocks.set(region, blocks);
+            else {
+                blocks.add(s);
+            }
         }
+        this.structBlocks.set(region, blocks);
         return region;
     }
     setIntersect(a, b) {

package/lib/utils/FileUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGjC;WAEa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WASrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;WA4BxE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAc1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA0BrH"}
+{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGjC;WAEa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WASrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;WA8BlG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAc1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA0BrH"}

package/lib/utils/FileUtils.js

@@ -79,19 +79,21 @@ class FileUtils {
             }
         });
         ohPkgContentMap.forEach((content, filePath) => {
-            if (content.dependencies) {
-                Object.entries(content.dependencies).forEach(([name, value]) => {
-                    if (!moduleMap.get(name)) {
-                        const modulePath = path_1.default.resolve(path_1.default.dirname(filePath), value.replace('file:', ''));
-                        const key = path_1.default.resolve(modulePath, EtsConst_1.OH_PACKAGE_JSON5);
-                        const target = ohPkgContentMap.get(key);
-                        if (target) {
-                            moduleMap.set(name, new ModulePath(modulePath, target.main ?
-                                path_1.default.resolve(modulePath, target.main) : ''));
-                        }
-                    }
-                });
+            if (!content.dependencies) {
+                return;
             }
+            Object.entries(content.dependencies).forEach(([name, value]) => {
+                if (moduleMap.get(name)) {
+                    return;
+                }
+                const modulePath = path_1.default.resolve(path_1.default.dirname(filePath), value.replace('file:', ''));
+                const key = path_1.default.resolve(modulePath, EtsConst_1.OH_PACKAGE_JSON5);
+                const target = ohPkgContentMap.get(key);
+                if (target) {
+                    moduleMap.set(name, new ModulePath(modulePath, target.main ?
+                        path_1.default.resolve(modulePath, target.main) : ''));
+                }
+            });
         });
         return moduleMap;
     }

package/lib/utils/callGraphUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callGraphUtils.d.ts","sourceRoot":"","sources":["../../src/utils/callGraphUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7E,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,cAAc,CAAyB;IAE/C,IAAI,QAAQ,IAAI,eAAe,EAAE,CAEhC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,EAEnC;IAED,IAAI,aAAa,IAAI,eAAe,EAAE,CAErC;IAED,IAAI,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,EAExC;IAEM,cAAc,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAIvE,mBAAmB,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO;IAKxD,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAU/C,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAUpD,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAIpD,uBAAuB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;CAGnE;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAS;IAEvB,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,EAErB;IAEM,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAiBpD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAkBnD,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,EAAE;CAmClE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAOtG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAY5D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAsB1I;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO/D"}
+{"version":3,"file":"callGraphUtils.d.ts","sourceRoot":"","sources":["../../src/utils/callGraphUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7E,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,cAAc,CAAyB;IAE/C,IAAI,QAAQ,IAAI,eAAe,EAAE,CAEhC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,EAEnC;IAED,IAAI,aAAa,IAAI,eAAe,EAAE,CAErC;IAED,IAAI,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,EAExC;IAEM,cAAc,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAIvE,mBAAmB,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO;IAKxD,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAU/C,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAUpD,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAIpD,uBAAuB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;CAGnE;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAS;IAEvB,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,EAErB;IAEM,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAkBpD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAmBnD,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,EAAE;CAqClE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAOtG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAY5D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAsB1I;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO/D"}

package/lib/utils/callGraphUtils.js

@@ -92,15 +92,16 @@ class SceneManager {
     }
     getMethod(method) {
         let targetMethod = this._scene.getMethod(method);
-        if (targetMethod == null) {
-            // 支持SDK调用解析
-            let file = this._scene.getFile(method.getDeclaringClassSignature().getDeclaringFileSignature());
-            if (file) {
-                const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(file);
-                for (let methodUnderFile of methods) {
-                    if (method.toString() === methodUnderFile.getSignature().toString()) {
-                        return methodUnderFile;
-                    }
+        if (targetMethod != null) {
+            return targetMethod;
+        }
+        // 支持SDK调用解析
+        let file = this._scene.getFile(method.getDeclaringClassSignature().getDeclaringFileSignature());
+        if (file) {
+            const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(file);
+            for (let methodUnderFile of methods) {
+                if (method.toString() === methodUnderFile.getSignature().toString()) {
+                    return methodUnderFile;
                 }
             }
         }
@@ -110,14 +111,15 @@ class SceneManager {
         if (typeof arkClass.getClassName() === "undefined")
             return null;
         let classInstance = this._scene.getClass(arkClass);
-        if (classInstance == null) {
-            let sdkOrTargetProjectFile = this._scene.getFile(arkClass.getDeclaringFileSignature());
-            // TODO: support get sdk class, targetProject class waiting to be supported
-            if (sdkOrTargetProjectFile != null) {
-                for (let classUnderFile of ModelUtils_1.ModelUtils.getAllClassesInFile(sdkOrTargetProjectFile)) {
-                    if (classUnderFile.getSignature().toString() === arkClass.toString()) {
-                        return classUnderFile;
-                    }
+        if (classInstance != null) {
+            return classInstance;
+        }
+        let sdkOrTargetProjectFile = this._scene.getFile(arkClass.getDeclaringFileSignature());
+        // TODO: support get sdk class, targetProject class waiting to be supported
+        if (sdkOrTargetProjectFile != null) {
+            for (let classUnderFile of ModelUtils_1.ModelUtils.getAllClassesInFile(sdkOrTargetProjectFile)) {
+                if (classUnderFile.getSignature().toString() === arkClass.toString()) {
+                    return classUnderFile;
                 }
             }
         }
@@ -132,12 +134,13 @@ class SceneManager {
             if (tempClass == null)
                 continue;
             let firstLevelSubclasses = Array.from(tempClass.getExtendedClasses().values());
-            if (firstLevelSubclasses) {
-                for (let subclass of firstLevelSubclasses) {
-                    if (!isItemRegistered(subclass, extendedClasses, (a, b) => a.getSignature().toString() === b.getSignature().toString())) {
-                        // 子类未处理，加入到classList
-                        classList.push(subclass);
-                    }
+            if (!firstLevelSubclasses) {
+                continue;
+            }
+            for (let subclass of firstLevelSubclasses) {
+                if (!isItemRegistered(subclass, extendedClasses, (a, b) => a.getSignature().toString() === b.getSignature().toString())) {
+                    // 子类未处理，加入到classList
+                    classList.push(subclass);
                 }
             }
             // 当前类处理完毕，标记为已处理

package/lib/utils/entryMethodUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entryMethodUtils.d.ts","sourceRoot":"","sources":["../../src/utils/entryMethodUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,eAAO,MAAM,qBAAqB,EAAE,MAAM,EA2BvC,CAAC;AACJ,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAiBtC,CAAC;AAEJ,eAAO,MAAM,+BAA+B,EAAE,MAAM,EAkBnD,CAAC;AAEF,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,CAcpF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,QAS5C"}
+{"version":3,"file":"entryMethodUtils.d.ts","sourceRoot":"","sources":["../../src/utils/entryMethodUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,eAAO,MAAM,qBAAqB,EAAE,MAAM,EA2BvC,CAAC;AACJ,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAiBtC,CAAC;AAEJ,eAAO,MAAM,+BAA+B,EAAE,MAAM,EAkBnD,CAAC;AAEF,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,CAkBpF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,QAS5C"}

package/lib/utils/entryMethodUtils.js

@@ -83,14 +83,17 @@ exports.COMPONENT_LIFECYCLE_METHOD_NAME = [
 ];
 function getCallbackMethodFromStmt(stmt, scene) {
     const invokeExpr = stmt.getInvokeExpr();
-    if (invokeExpr && invokeExpr.getMethodSignature().getDeclaringClassSignature().getClassName() === '' && exports.CALLBACK_METHOD_NAME.includes(invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName())) {
-        for (const arg of invokeExpr.getArgs()) {
-            const argType = arg.getType();
-            if (argType instanceof Type_1.FunctionType) {
-                const cbMethod = scene.getMethod(argType.getMethodSignature());
-                if (cbMethod) {
-                    return cbMethod;
-                }
+    if (invokeExpr === undefined ||
+        invokeExpr.getMethodSignature().getDeclaringClassSignature().getClassName() !== '' ||
+        !exports.CALLBACK_METHOD_NAME.includes(invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName())) {
+        return null;
+    }
+    for (const arg of invokeExpr.getArgs()) {
+        const argType = arg.getType();
+        if (argType instanceof Type_1.FunctionType) {
+            const cbMethod = scene.getMethod(argType.getMethodSignature());
+            if (cbMethod) {
+                return cbMethod;
             }
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.29",
-  "commit_id": "48e41990",
+  "version": "1.0.31",
+  "commit_id": "b0ddd978",
   "files": [
     "docs",
     "lib",