arkanalyzer 1.0.6 → 1.0.8

package/lib/utils/CfgStructualAnalysis.js

@@ -28,7 +28,7 @@ var CodeBlockType;
     CodeBlockType[CodeBlockType["WHILE"] = 7] = "WHILE";
     CodeBlockType[CodeBlockType["FOR"] = 8] = "FOR";
     CodeBlockType[CodeBlockType["COMPOUND_END"] = 9] = "COMPOUND_END";
-})(CodeBlockType || (exports.CodeBlockType = CodeBlockType = {}));
+})(CodeBlockType = exports.CodeBlockType || (exports.CodeBlockType = {}));
 class AbstractFlowGraph {
     constructor(cfg) {
         this.nodes = [];
@@ -83,7 +83,7 @@ class AbstractFlowGraph {
                 let node = this.nodes[i];
                 let nset = new Set();
                 let rtype = this.identifyRegionType(node, nset);
-                if (rtype != undefined) {
+                if (rtype !== undefined) {
                     let p = this.reduce(rtype, nset);
                     if (p) {
                         if (nset.has(this.entry)) {
@@ -145,12 +145,15 @@ class AbstractFlowGraph {
         let dom = this.buildDominator();
         let loops = [];
         for (const header of this.nodes) {
-            let innermost = undefined;
+            let innermost;
             let longest = 0;
             let backEdges = this.getBackEdges(dom, header);
-            if (backEdges.size == 0) {
+            if (backEdges.size === 0) {
                 continue;
             }
+            if (this.isSelfLoopNode(header)) {
+                loops.push(new Set([header]));
+            }
             for (const start of backEdges) {
                 let loop = this.naturalLoop(start, header);
                 if (!innermost || loop.size > longest) {
@@ -167,7 +170,7 @@ class AbstractFlowGraph {
         let domin = new Map();
         domin.set(this.entry, new Set([this.entry]));
         for (const node of this.nodes) {
-            if (node != this.entry) {
+            if (node !== this.entry) {
                 domin.set(node, new Set(this.nodes));
             }
         }
@@ -175,7 +178,7 @@ class AbstractFlowGraph {
         while (change) {
             change = false;
             for (const node of this.nodes) {
-                if (node == this.entry) {
+                if (node === this.entry) {
                     continue;
                 }
                 let t = new Set(domin.get(node));
@@ -218,10 +221,25 @@ class AbstractFlowGraph {
         }
         return loop;
     }
+    isSelfLoopNode(node) {
+        let inSucc = false;
+        let inPred = false;
+        for (const pred of node.getPred()) {
+            if (pred === node) {
+                inPred = true;
+            }
+        }
+        for (const succ of node.getSucc()) {
+            if (succ === node) {
+                inSucc = true;
+            }
+        }
+        return inSucc && inPred;
+    }
     isForLoopIncNode(node) {
         for (const loop of this.loopMap.values()) {
-            if (loop.getType() == RegionType.FOR_LOOP_REGION) {
-                if (node == loop.inc) {
+            if (loop.getType() === RegionType.FOR_LOOP_REGION) {
+                if (node === loop.inc) {
                     return true;
                 }
             }
@@ -236,12 +254,12 @@ class AbstractFlowGraph {
     }
     isIfRegion(node, nodeSet) {
         nodeSet.clear();
-        if (node.getSucc().length != 2) {
+        if (node.getSucc().length !== 2) {
             return false;
         }
         let m = node.getSucc()[0];
         let n = node.getSucc()[1];
-        if (m.getSucc().length == 1 && m.getSucc()[0] == n) {
+        if (m.getSucc().length === 1 && m.getSucc()[0] === n) {
             nodeSet.add(node).add(m);
             return true;
         }
@@ -249,7 +267,7 @@ class AbstractFlowGraph {
     }
     isIfExitRegion(node, nodeSet) {
         nodeSet.clear();
-        if (node.getSucc().length != 2) {
+        if (node.getSucc().length !== 2) {
             return false;
         }
         let m = node.getSucc()[0];
@@ -261,17 +279,17 @@ class AbstractFlowGraph {
     }
     isIfElseRegion(node, nodeSet) {
         nodeSet.clear();
-        if (node.getSucc().length != 2) {
+        if (node.getSucc().length !== 2) {
             return false;
         }
         let m = node.getSucc()[0];
         let n = node.getSucc()[1];
-        if ((m.getSucc().length == 1 &&
-            n.getSucc().length == 1 &&
-            m.getPred().length == 1 &&
-            n.getPred().length == 1 &&
-            m.getSucc()[0] == n.getSucc()[0]) ||
-            (m.getSucc().length == 0 && n.getSucc().length == 0)) {
+        if ((m.getSucc().length === 1 &&
+            n.getSucc().length === 1 &&
+            m.getPred().length === 1 &&
+            n.getPred().length === 1 &&
+            m.getSucc()[0] === n.getSucc()[0]) ||
+            (m.getSucc().length === 0 && n.getSucc().length === 0)) {
             nodeSet.add(node).add(m).add(n);
             return true;
         }
@@ -280,15 +298,15 @@ class AbstractFlowGraph {
     isBlockRegion(node, nodeSet) {
         let n = node;
         let p = true;
-        let s = n.getSucc().length == 1;
+        let s = n.getSucc().length === 1;
         nodeSet.clear();
         let blocks = [];
         while (p && s && !nodeSet.has(n) && this.isValidInBlocks(n)) {
             nodeSet.add(n);
             blocks.push(n);
             n = n.getSucc()[0];
-            p = n.getPred().length == 1;
-            s = n.getSucc().length == 1;
+            p = n.getPred().length === 1;
+            s = n.getSucc().length === 1;
         }
         if (p && this.isValidInBlocks(n)) {
             if (!nodeSet.has(n)) {
@@ -297,7 +315,7 @@ class AbstractFlowGraph {
             nodeSet.add(n);
         }
         n = node;
-        p = n.getPred().length == 1;
+        p = n.getPred().length === 1;
         s = true;
         while (p && s && this.isValidInBlocks(n)) {
             if (!nodeSet.has(n)) {
@@ -308,8 +326,8 @@ class AbstractFlowGraph {
             if (nodeSet.has(n)) {
                 break;
             }
-            p = n.getPred().length == 1;
-            s = n.getSucc().length == 1;
+            p = n.getPred().length === 1;
+            s = n.getSucc().length === 1;
         }
         if (s && this.isValidInBlocks(n)) {
             if (!nodeSet.has(n)) {
@@ -333,7 +351,7 @@ class AbstractFlowGraph {
             nodeSet.add(node);
             return true;
         }
-        if (m.getSucc().length == 1 && this.isExitLoop(m.getSucc()[0], this.structBlocks.get(loop))) {
+        if (m.getSucc().length === 1 && this.isExitLoop(m.getSucc()[0], this.structBlocks.get(loop))) {
             nodeSet.add(node).add(m);
             return true;
         }
@@ -347,7 +365,7 @@ class AbstractFlowGraph {
             nodeSet.add(node);
             return true;
         }
-        if (m.getSucc().length == 1 &&
+        if (m.getSucc().length === 1 &&
             loop.control.has(m.getSucc()[0]) &&
             !loop.control.has(n) &&
             !this.isIfElseRegion(node, nodeSet)) {
@@ -359,7 +377,7 @@ class AbstractFlowGraph {
     isWhileRegion(node, nodeSet, loop) {
         nodeSet.clear();
         let m = node.getSucc()[0];
-        if (loop.header == node && m.getSucc().length == 1 && m.getPred().length == 1 && m.getSucc()[0] == node) {
+        if (loop.header === node && m.getSucc().length === 1 && m.getPred().length === 1 && m.getSucc()[0] === node) {
             nodeSet.add(node).add(m);
             return true;
         }
@@ -367,12 +385,12 @@ class AbstractFlowGraph {
     }
     isForRegion(node, nodeSet, loop) {
         nodeSet.clear();
-        if (loop.header == node && loop.getType() == RegionType.FOR_LOOP_REGION) {
+        if (loop.header === node && loop.getType() === RegionType.FOR_LOOP_REGION) {
             let forLoop = loop;
             let blocks = node.getSucc()[0];
-            if (forLoop.inc.getPred().length == 1 &&
-                forLoop.inc.getPred()[0] == blocks &&
-                blocks.getSucc().length == 1) {
+            if (forLoop.inc.getPred().length === 1 &&
+                forLoop.inc.getPred()[0] === blocks &&
+                blocks.getSucc().length === 1) {
                 nodeSet.add(node).add(forLoop.inc).add(blocks);
                 return true;
             }
@@ -381,9 +399,9 @@ class AbstractFlowGraph {
     }
     isDoWhileRegion(node, nodeSet, loop) {
         nodeSet.clear();
-        if (loop.back == node && loop.getType() == RegionType.DO_WHILE_LOOP_REGION) {
+        if (loop.back === node && loop.getType() === RegionType.DO_WHILE_LOOP_REGION) {
             let blocks = node.getPred()[0];
-            if (blocks.getSucc().length == 1 && blocks.getSucc()[0] == node && node.getSucc()[0] == blocks) {
+            if (blocks.getSucc().length === 1 && blocks.getSucc()[0] === node && node.getSucc()[0] === blocks) {
                 nodeSet.add(blocks).add(node);
                 return true;
             }
@@ -401,9 +419,12 @@ class AbstractFlowGraph {
         }
         if (new Set(node.getPred()).has(node) && new Set(node.getSucc()).has(node)) {
             nodeSet.add(node);
+            if (inLoop) {
+                return region === null || region === void 0 ? void 0 : region.getType();
+            }
             return RegionType.SELF_LOOP_REGION;
         }
-        if (node.getSucc().length != 2) {
+        if (node.getSucc().length !== 2) {
             return undefined;
         }
         if (inLoop) {
@@ -440,11 +461,15 @@ class AbstractFlowGraph {
         return undefined;
     }
     cyclicRegionType(nodeSet) {
-        var _a, _b;
+        var _a, _b, _c;
         let nodes = Array.from(nodeSet);
         let header = nodes[0];
-        if (nodeSet.size == 1) {
-            return RegionType.SELF_LOOP_REGION;
+        if (nodeSet.size === 1) {
+            let tail = (_a = nodes[0].getBlock()) === null || _a === void 0 ? void 0 : _a.getTail();
+            if (tail instanceof Stmt_1.ArkIfStmt) {
+                return RegionType.DO_WHILE_LOOP_REGION;
+            }
+            return RegionType.WHILE_LOOP_REGION;
         }
         let back = nodes[1];
         // exit loop from back
@@ -458,10 +483,10 @@ class AbstractFlowGraph {
             }
         }
         // for
-        if (back.getSucc().length == 1 && ((_b = (_a = back.getBlock()) === null || _a === void 0 ? void 0 : _a.getStmts()) === null || _b === void 0 ? void 0 : _b.length) == 1) {
+        if (back.getSucc().length === 1 && ((_c = (_b = back.getBlock()) === null || _b === void 0 ? void 0 : _b.getStmts()) === null || _c === void 0 ? void 0 : _c.length) === 1) {
             let isForLoop = true;
             for (const pred of header.getPred()) {
-                if (nodeSet.has(pred) && pred != back) {
+                if (nodeSet.has(pred) && pred !== back) {
                     isForLoop = false;
                 }
             }
@@ -496,38 +521,38 @@ class AbstractFlowGraph {
     }
     createRegion(rtype, nodeSet) {
         let node;
-        if (rtype == RegionType.BLOCK_REGION) {
+        if (rtype === RegionType.BLOCK_REGION) {
             node = new BlockRegion(nodeSet);
         }
-        else if (rtype == RegionType.IF_ELSE_REGION) {
+        else if (rtype === RegionType.IF_ELSE_REGION) {
             node = new IfElseRegion(nodeSet);
         }
-        else if (rtype == RegionType.IF_REGION) {
+        else if (rtype === RegionType.IF_REGION) {
             node = new IfRegion(nodeSet);
         }
-        else if (rtype == RegionType.IF_THEN_EXIT_REGION) {
+        else if (rtype === RegionType.IF_THEN_EXIT_REGION) {
             node = new IfExitRegion(nodeSet);
         }
-        else if (rtype == RegionType.IF_THEN_BREAK_REGION) {
+        else if (rtype === RegionType.IF_THEN_BREAK_REGION) {
             node = new IfBreakRegion(nodeSet);
         }
-        else if (rtype == RegionType.IF_THEN_CONTINUE_REGION) {
+        else if (rtype === RegionType.IF_THEN_CONTINUE_REGION) {
             node = new IfContinueRegion(nodeSet);
         }
-        else if (rtype == RegionType.SELF_LOOP_REGION) {
+        else if (rtype === RegionType.SELF_LOOP_REGION) {
             node = new SelfLoopRegion(nodeSet);
         }
-        else if (rtype == RegionType.WHILE_LOOP_REGION) {
+        else if (rtype === RegionType.WHILE_LOOP_REGION) {
             let whileLoop = new WhileLoopRegion(nodeSet);
             this.loopMap.set(whileLoop.header, whileLoop);
             node = whileLoop;
         }
-        else if (rtype == RegionType.FOR_LOOP_REGION) {
+        else if (rtype === RegionType.FOR_LOOP_REGION) {
             let forLoop = new ForLoopRegion(nodeSet);
             this.loopMap.set(forLoop.header, forLoop);
             node = forLoop;
         }
-        else if (rtype == RegionType.DO_WHILE_LOOP_REGION) {
+        else if (rtype === RegionType.DO_WHILE_LOOP_REGION) {
             let doWhileLoop = new DoWhileLoopRegion(nodeSet);
             this.loopMap.set(doWhileLoop.header, doWhileLoop);
             node = doWhileLoop;
@@ -557,9 +582,6 @@ class AbstractFlowGraph {
     }
     setIntersect(a, b) {
         let r = new Set();
-        if (b == undefined) {
-            debugger;
-        }
         for (const n of b) {
             if (a.has(n)) {
                 r.add(n);
@@ -568,10 +590,10 @@ class AbstractFlowGraph {
         return r;
     }
     isSetEqual(a, b) {
-        if (a.size != b.size) {
+        if (a.size !== b.size) {
             return false;
         }
-        return this.setIntersect(a, b).size == a.size;
+        return this.setIntersect(a, b).size === a.size;
     }
 }
 exports.AbstractFlowGraph = AbstractFlowGraph;
@@ -620,7 +642,7 @@ class AbstractNode {
     }
     replaceSucc(src, dst) {
         for (let i = 0; i < this.succNodes.length; i++) {
-            if (this.succNodes[i] == src) {
+            if (this.succNodes[i] === src) {
                 this.succNodes[i] = dst;
                 break;
             }
@@ -628,7 +650,7 @@ class AbstractNode {
     }
     removeSucc(src) {
         for (let i = 0; i < this.predNodes.length; i++) {
-            if (this.succNodes[i] == src) {
+            if (this.succNodes[i] === src) {
                 this.succNodes.splice(i, 1);
                 break;
             }
@@ -642,7 +664,7 @@ class AbstractNode {
     }
     replacePred(src, dst) {
         for (let i = 0; i < this.predNodes.length; i++) {
-            if (this.predNodes[i] == src) {
+            if (this.predNodes[i] === src) {
                 this.predNodes[i] = dst;
                 break;
             }
@@ -650,7 +672,7 @@ class AbstractNode {
     }
     removePred(src) {
         for (let i = 0; i < this.predNodes.length; i++) {
-            if (this.predNodes[i] == src) {
+            if (this.predNodes[i] === src) {
                 this.predNodes.splice(i, 1);
                 break;
             }
@@ -718,7 +740,12 @@ class NaturalLoopRegion extends Region {
         super(nset, type);
         let nodes = Array.from(nset);
         this.header = nodes[0];
-        this.back = nodes[1];
+        if (nset.size > 1) {
+            this.back = nodes[1];
+        }
+        else {
+            this.back = nodes[0];
+        }
         this.control = new Set([this.header]);
     }
     replace() {
@@ -736,7 +763,7 @@ class NaturalLoopRegion extends Region {
                 }
             }
         }
-        if (succNodes.size == 0) {
+        if (succNodes.size === 0) {
             return;
         }
         let pred = Array.from(succNodes)[0];
@@ -759,9 +786,9 @@ class NaturalLoopRegion extends Region {
         for (const node of this.nset) {
             for (const succ of node.getSucc()) {
                 if (!this.nset.has(succ) &&
-                    succ != this.getExitNode() &&
-                    succ.getSucc().length == 1 &&
-                    succ.getSucc()[0] == this.getExitNode()) {
+                    succ !== this.getExitNode() &&
+                    succ.getSucc().length === 1 &&
+                    succ.getSucc()[0] === this.getExitNode()) {
                     this.nset.add(succ);
                 }
             }
@@ -775,13 +802,13 @@ class SelfLoopRegion extends NaturalLoopRegion {
     }
     replace() {
         for (let pred of this.header.getPred()) {
-            if (pred != this.header) {
+            if (pred !== this.header) {
                 pred.replaceSucc(this.header, this);
                 this.addPred(pred);
             }
         }
         for (let succ of this.header.getSucc()) {
-            if (succ != this.header) {
+            if (succ !== this.header) {
                 succ.replacePred(this.header, this);
                 this.addSucc(succ);
             }
@@ -797,7 +824,9 @@ class WhileLoopRegion extends NaturalLoopRegion {
     }
     traversal(callback) {
         this.header.traversal(callback, CodeBlockType.WHILE);
-        this.back.traversal(callback, CodeBlockType.NORMAL);
+        if (this.header !== this.back) {
+            this.back.traversal(callback, CodeBlockType.NORMAL);
+        }
         callback(undefined, CodeBlockType.COMPOUND_END);
     }
     getExitNode() {
@@ -812,7 +841,9 @@ class DoWhileLoopRegion extends NaturalLoopRegion {
     }
     traversal(callback) {
         callback(undefined, CodeBlockType.DO);
-        this.header.traversal(callback, CodeBlockType.NORMAL);
+        if (this.header !== this.back) {
+            this.header.traversal(callback, CodeBlockType.NORMAL);
+        }
         this.back.traversal(callback, CodeBlockType.DO_WHILE);
     }
     getExitNode() {
@@ -828,7 +859,7 @@ class ForLoopRegion extends NaturalLoopRegion {
     traversal(callback) {
         this.header.traversal(callback, CodeBlockType.FOR);
         for (const node of this.nset) {
-            if (node != this.header && node != this.inc) {
+            if (node !== this.header && node !== this.inc) {
                 node.traversal(callback, CodeBlockType.NORMAL);
             }
         }
@@ -848,7 +879,7 @@ class IfRegion extends Region {
     replace() {
         this.replaceContitionPred();
         for (let succ of this.then.getSucc()) {
-            if (succ != this.then) {
+            if (succ !== this.then) {
                 succ.replacePred(this.then, this);
                 succ.removePred(this.contition);
                 this.addSucc(succ);
@@ -862,7 +893,7 @@ class IfRegion extends Region {
     }
     replaceContitionPred() {
         for (let pred of this.contition.getPred()) {
-            if (pred != this.contition) {
+            if (pred !== this.contition) {
                 pred.replaceSucc(this.contition, this);
                 this.addPred(pred);
             }
@@ -932,13 +963,13 @@ class IfElseRegion extends Region {
     }
     replace() {
         for (let pred of this.contition.getPred()) {
-            if (pred != this.contition) {
+            if (pred !== this.contition) {
                 pred.replaceSucc(this.contition, this);
                 this.addPred(pred);
             }
         }
         for (let succ of this.then.getSucc()) {
-            if (succ != this.then) {
+            if (succ !== this.then) {
                 succ.replacePred(this.then, this);
                 succ.removePred(this.else);
                 this.addSucc(succ);

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;IAmBpD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAmBnD,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;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"}

package/lib/utils/callGraphUtils.js

@@ -94,14 +94,12 @@ class SceneManager {
         let targetMethod = this._scene.getMethod(method);
         if (targetMethod == null) {
             // 支持SDK调用解析
-            let sdkMap = this.scene.getSdkArkFilesMap();
-            for (let file of sdkMap.values()) {
-                if (file.getFileSignature().toString() == method.getDeclaringClassSignature().getDeclaringFileSignature().toString()) {
-                    const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(file);
-                    for (let methodUnderFile of methods) {
-                        if (method.toString() == methodUnderFile.getSignature().toString()) {
-                            return methodUnderFile;
-                        }
+            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;
                     }
                 }
             }
@@ -113,8 +111,7 @@ class SceneManager {
             return null;
         let classInstance = this._scene.getClass(arkClass);
         if (classInstance == null) {
-            let sdkOrTargetProjectFile = this._scene.getSdkArkFilesMap()
-                .get(arkClass.getDeclaringFileSignature().toString());
+            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)) {

package/lib/utils/crypto_utils.d.ts

@@ -0,0 +1,6 @@
+export declare class CryptoUtils {
+    static sha256(content: string): string;
+    static hash(content: string, algorithm: string): string;
+    static hashcode(content: string): number;
+}
+//# sourceMappingURL=crypto_utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"crypto_utils.d.ts","sourceRoot":"","sources":["../../src/utils/crypto_utils.ts"],"names":[],"mappings":"AAiBA,qBAAa,WAAW;WAEN,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WAI/B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;WAIhD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAOlD"}

package/lib/utils/crypto_utils.js

@@ -0,0 +1,57 @@
+"use strict";
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CryptoUtils = void 0;
+const crypto = __importStar(require("crypto"));
+class CryptoUtils {
+    static sha256(content) {
+        return this.hash(content, 'sha256');
+    }
+    static hash(content, algorithm) {
+        return crypto.createHash(algorithm).update(content).digest('base64url');
+    }
+    static hashcode(content) {
+        let h = 0;
+        for (let i = 0; i < content.length; i++) {
+            h = Math.imul(31, h) + content.charCodeAt(i) | 0;
+        }
+        return h;
+    }
+}
+exports.CryptoUtils = CryptoUtils;

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

@@ -1 +1 @@
-{"version":3,"file":"entryMethodUtils.d.ts","sourceRoot":"","sources":["../../src/utils/entryMethodUtils.ts"],"names":[],"mappings":"AAgBA,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,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,eAAO,MAAM,qBAAqB,EAAE,MAAM,EA0BvC,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,YAAY,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,EAAE,CAuBtG;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":"AAgBA,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,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,YAAY,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,EAAE,CAuBtG;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,CAcpF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,QAS5C"}