arkanalyzer 1.0.40 → 1.0.42

package/lib/callgraph/pointerAnalysis/Pag.js

@@ -57,7 +57,6 @@ const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER,
 /*
  * Implementation of pointer-to assignment graph for pointer analysis
  */
-const DUMMY_PAG_NODE_ID = -1;
 var PagEdgeKind;
 (function (PagEdgeKind) {
     PagEdgeKind[PagEdgeKind["Address"] = 0] = "Address";
@@ -398,8 +397,8 @@ class PagStaticFieldNode extends PagNode {
 }
 exports.PagStaticFieldNode = PagStaticFieldNode;
 class PagThisRefNode extends PagNode {
-    constructor(id, thisRef) {
-        super(id, DUMMY_PAG_NODE_ID, thisRef, PagNodeKind.ThisRef);
+    constructor(id, cid = undefined, thisRef) {
+        super(id, cid, thisRef, PagNodeKind.ThisRef);
         this.pointToNode = [];
     }
     getThisPTNode() {
@@ -498,8 +497,8 @@ class PagFuncNode extends PagNode {
     getThisPt() {
         return this.thisPt;
     }
-    setCS(callsite) {
-        this.originCallSite = callsite;
+    setCS(callSite) {
+        this.originCallSite = callSite;
     }
     getCS() {
         return this.originCallSite;
@@ -673,7 +672,7 @@ class Pag extends BaseExplicitGraph_1.BaseExplicitGraph {
             pagNode = new PagParamNode(id, cid, value, stmt);
         }
         else if (value instanceof Ref_1.ArkThisRef) {
-            throw new Error('This Node needs to use addThisNode method');
+            pagNode = new PagThisRefNode(id, cid, value);
         }
         else {
             throw new Error('unsupported Value type ' + value.getType().toString());
@@ -771,29 +770,6 @@ class Pag extends BaseExplicitGraph_1.BaseExplicitGraph {
         }
         this.contextBaseToIdMap.set(base, ctxMap);
     }
-    /*
-     * This node has no context info
-     * but point to node info
-     */
-    addPagThisRefNode(value) {
-        let id = this.nodeNum + 1;
-        let pagNode = new PagThisRefNode(id, value);
-        this.addNode(pagNode);
-        return pagNode;
-    }
-    addPagThisLocalNode(ptNode, value) {
-        let id = this.nodeNum + 1;
-        let pagNode = new PagLocalNode(id, ptNode, value);
-        this.addNode(pagNode);
-        return pagNode;
-    }
-    getOrNewThisRefNode(thisRefNodeID, value) {
-        if (thisRefNodeID !== -1) {
-            return this.getNode(thisRefNodeID);
-        }
-        let thisRefNode = this.addPagThisRefNode(value);
-        return thisRefNode;
-    }
     getOrNewThisLocalNode(cid, ptNode, value, s) {
         if (ptNode !== -1) {
             return this.getNode(ptNode);
@@ -886,6 +862,7 @@ class Pag extends BaseExplicitGraph_1.BaseExplicitGraph {
                 break;
             default:
         }
+        this.edgeNum++;
         return true;
     }
     getAddrEdges() {

package/lib/callgraph/pointerAnalysis/PagBuilder.d.ts

@@ -1,15 +1,15 @@
 import { CallGraph, CallSite, DynCallSite, FuncID, ICallSite } from '../model/CallGraph';
 import { Scene } from '../../Scene';
 import { Stmt } from '../../core/base/Stmt';
-import { ArkThisRef } from '../../core/base/Ref';
 import { Value } from '../../core/base/Value';
 import { ArkMethod } from '../../core/model/ArkMethod';
 import { Local } from '../../core/base/Local';
 import { NodeID } from '../../core/graph/BaseExplicitGraph';
-import { ContextID } from './Context';
 import { FuncPag, InterFuncPag, Pag, PagNode, PagNodeType, StorageType } from './Pag';
 import { IPtsCollection } from './PtsDS';
-import { PtaAnalysisScale } from './PointerAnalysisConfig';
+import { PointerAnalysisConfig } from './PointerAnalysisConfig';
+import { ContextID } from './context/Context';
+import { ContextSelector } from './context/ContextSelector';
 export declare class CSFuncID {
     cid: ContextID;
     funcID: FuncID;
@@ -22,15 +22,12 @@ export declare class PagBuilder {
     private funcPags;
     private interFuncPags?;
     private handledFunc;
-    private ctx;
+    private ctxSelector;
     private scene;
     private worklist;
     private pagStat;
     private staticField2UniqInstanceMap;
     private instanceField2UniqInstanceMap;
-    private cid2ThisRefPtMap;
-    private cid2ThisRefMap;
-    private cid2ThisLocalMap;
     private sdkMethodReturnValueMap;
     private methodParamValueMap;
     private fakeSdkMethodParamDeclaringStmt;
@@ -42,7 +39,7 @@ export declare class PagBuilder {
     private storagePropertyMap;
     private externalScopeVariableMap;
     private retriggerNodesList;
-    constructor(p: Pag, cg: CallGraph, s: Scene, kLimit: number, scale: PtaAnalysisScale);
+    constructor(p: Pag, cg: CallGraph, s: Scene, config: PointerAnalysisConfig);
     private buildFuncPagAndAddToWorklist;
     private addToFuncHandledListThisRound;
     buildForEntries(funcIDs: FuncID[]): void;
@@ -103,14 +100,7 @@ export declare class PagBuilder {
     private addSDKMethodReturnPagEdge;
     private addSDKMethodParamPagEdge;
     getOrNewPagNode(cid: ContextID, v: PagNodeType, s?: Stmt): PagNode;
-    /**
-     * return ThisRef PAG node according to cid, a cid has a unique ThisRef node
-     * @param cid: current contextID
-     */
-    getOrNewThisRefNode(cid: ContextID, v: ArkThisRef): PagNode;
-    getOrNewThisLoalNode(cid: ContextID, v: Local, s?: Stmt): PagNode;
     getOrNewGlobalThisNode(cid: ContextID): PagNode;
-    getUniqThisLocalNode(cid: ContextID): NodeID | undefined;
     /**
      * search the storage map to get propertyNode with given storage and propertyFieldName
      * @param storage storage type: AppStorage, LocalStorage etc.
@@ -194,5 +184,6 @@ export declare class PagBuilder {
     getUpdatedNodes(): Map<number, IPtsCollection<number>>;
     resetUpdatedNodes(): void;
     private transferArrayValues;
+    getContextSelector(): ContextSelector;
 }
 //# sourceMappingURL=PagBuilder.d.ts.map

package/lib/callgraph/pointerAnalysis/PagBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PagBuilder.d.ts","sourceRoot":"","sources":["../../../src/callgraph/pointerAnalysis/PagBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PagBuilder.d.ts","sourceRoot":"","sources":["../../../src/callgraph/pointerAnalysis/PagBuilder.ts"],"names":[],"mappings":"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"}

package/lib/callgraph/pointerAnalysis/PagBuilder.js

@@ -47,11 +47,12 @@ const Local_1 = require("../../core/base/Local");
 const Type_1 = require("../../core/base/Type");
 const Constant_1 = require("../../core/base/Constant");
 const Statistics_1 = require("../common/Statistics");
-const Context_1 = require("./Context");
 const Pag_1 = require("./Pag");
 const TSConst_1 = require("../../core/common/TSConst");
 const PTAUtils_1 = require("./PTAUtils");
 const PointerAnalysisConfig_1 = require("./PointerAnalysisConfig");
+const Context_1 = require("./context/Context");
+const ContextSelector_1 = require("./context/ContextSelector");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'PTA');
 class CSFuncID {
     constructor(cid, fid) {
@@ -61,15 +62,12 @@ class CSFuncID {
 }
 exports.CSFuncID = CSFuncID;
 class PagBuilder {
-    constructor(p, cg, s, kLimit, scale) {
+    constructor(p, cg, s, config) {
         this.handledFunc = new Set();
         this.worklist = [];
         // TODO: change string to hash value
         this.staticField2UniqInstanceMap = new Map();
         this.instanceField2UniqInstanceMap = new Map();
-        this.cid2ThisRefPtMap = new Map();
-        this.cid2ThisRefMap = new Map();
-        this.cid2ThisLocalMap = new Map();
         this.sdkMethodReturnValueMap = new Map();
         // record the SDK API param, and create fake Values
         this.methodParamValueMap = new Map();
@@ -83,11 +81,25 @@ class PagBuilder {
         this.retriggerNodesList = new Set();
         this.pag = p;
         this.cg = cg;
-        this.scale = scale;
+        this.scale = config.analysisScale;
         this.funcPags = new Map();
-        this.ctx = new Context_1.KLimitedContextSensitive(kLimit);
         this.scene = s;
         this.pagStat = new Statistics_1.PAGStat();
+        let kLimit = config.kLimit;
+        switch (config.contextType) {
+            case PointerAnalysisConfig_1.ContextType.CallSite:
+                this.ctxSelector = new ContextSelector_1.KCallSiteContextSelector(kLimit);
+                break;
+            case PointerAnalysisConfig_1.ContextType.Obj:
+                this.ctxSelector = new ContextSelector_1.KObjContextSelector(kLimit);
+                break;
+            case PointerAnalysisConfig_1.ContextType.Func:
+                this.ctxSelector = new ContextSelector_1.KFuncContextSelector(kLimit);
+                break;
+            default:
+                this.ctxSelector = new ContextSelector_1.KCallSiteContextSelector(kLimit);
+                break;
+        }
     }
     buildFuncPagAndAddToWorklist(cs) {
         if (this.worklist.includes(cs)) {
@@ -109,12 +121,12 @@ class PagBuilder {
     buildForEntries(funcIDs) {
         this.worklist = [];
         funcIDs.forEach(funcID => {
-            let cid = this.ctx.getNewContextID(funcID);
+            let cid = this.ctxSelector.emptyContext(funcID);
             let csFuncID = new CSFuncID(cid, funcID);
             this.buildFuncPagAndAddToWorklist(csFuncID);
         });
         this.handleReachable();
-        this.globalThisPagNode = this.getOrNewGlobalThisNode(-1);
+        this.globalThisPagNode = this.getOrNewGlobalThisNode(ContextSelector_1.emptyID);
         this.pag.addPagEdge(this.globalThisPagNode, this.globalThisPagNode, Pag_1.PagEdgeKind.Copy);
     }
     handleReachable() {
@@ -131,7 +143,7 @@ class PagBuilder {
     }
     build() {
         for (let funcID of this.cg.getEntries()) {
-            let cid = this.ctx.getNewContextID(funcID);
+            let cid = this.ctxSelector.emptyContext(funcID);
             let csFuncID = new CSFuncID(cid, funcID);
             this.buildFuncPagAndAddToWorklist(csFuncID);
             this.handleReachable();
@@ -193,12 +205,12 @@ class PagBuilder {
             });
             return;
         }
-        let dycs = this.cg.getDynCallsiteByStmt(stmt);
+        let dycs = this.cg.getDynCallSiteByStmt(stmt);
         if (dycs) {
             this.addToDynamicCallSite(fpag, dycs);
         }
         else {
-            logger.error(`can not find callsite by stmt: ${stmt.toString()}`);
+            logger.error(`can not find callSite by stmt: ${stmt.toString()}`);
         }
     }
     processExternalScopeValue(value, funcID) {
@@ -324,8 +336,9 @@ class PagBuilder {
     addCallsEdgesFromFuncPag(funcPag, cid) {
         for (let cs of funcPag.getNormalCallSites()) {
             let ivkExpr = cs.callStmt.getInvokeExpr();
-            let calleeCid = this.ctx.getOrNewContext(cid, cs.calleeFuncID, true);
-            let calleeCGNode = this.cg.getNode(cs.calleeFuncID);
+            const calleeFuncID = cs.getCalleeFuncID();
+            let calleeCid = this.ctxSelector.selectContext(cid, cs, ContextSelector_1.emptyID, calleeFuncID);
+            let calleeCGNode = this.cg.getNode(calleeFuncID);
             if (this.scale === PointerAnalysisConfig_1.PtaAnalysisScale.MethodLevel) {
                 this.addStaticPagCallReturnEdge(cs, cid, calleeCid);
             }
@@ -338,19 +351,24 @@ class PagBuilder {
             if (calleeCGNode.getKind() === CallGraph_1.CallGraphNodeKind.constructor || calleeCGNode.getKind() === CallGraph_1.CallGraphNodeKind.intrinsic) {
                 let callee = this.scene.getMethod(this.cg.getMethodByFuncID(cs.calleeFuncID));
                 if (ivkExpr instanceof Expr_1.ArkInstanceInvokeExpr) {
-                    let baseNode = this.getOrNewPagNode(cid, ivkExpr.getBase());
-                    let baseNodeID = baseNode.getID();
-                    this.addThisRefCallEdge(baseNodeID, cid, ivkExpr.getBase(), callee, calleeCid, cs.callerFuncID);
+                    this.addThisRefCallEdge(cid, ivkExpr.getBase(), callee, calleeCid, cs.callerFuncID);
                 }
                 else {
                     logger.error(`constructor or intrinsic func is static ${ivkExpr.toString()}`);
                 }
             }
+            const callerMethod = this.cg.getArkMethodByFuncID(cs.callerFuncID);
+            const calleeMethod = this.cg.getArkMethodByFuncID(calleeFuncID);
+            if (!callerMethod || !calleeMethod) {
+                logger.error(`can not find caller or callee method by funcID ${cs.callerFuncID} ${calleeFuncID}`);
+                return false;
+            }
+            this.cg.addDirectOrSpecialCallEdge(callerMethod.getSignature(), calleeMethod.getSignature(), cs.callStmt);
         }
         return true;
     }
     addDynamicCallSite(funcPag, funcID, cid) {
-        // add dyn callsite in funcpag to base node
+        // add dyn callSite in funcpag to base node
         for (let cs of funcPag.getDynamicCallSites()) {
             let invokeExpr = cs.callStmt.getInvokeExpr();
             let base;
@@ -443,8 +461,8 @@ class PagBuilder {
             if (this.cg.detectReachable(dstCGNode.getID(), callerNode.getID())) {
                 return srcNodes;
             }
-            let calleeCid = this.ctx.getOrNewContext(cid, dstCGNode.getID(), true);
-            let staticCS = new CallGraph_1.CallSite(cs.callStmt, cs.args, dstCGNode.getID(), cs.callerFuncID);
+            let staticCS = this.cg.getCallSiteManager().cloneCallSiteFromDyn(cs, dstCGNode.getID());
+            let calleeCid = this.ctxSelector.selectContext(cid, staticCS, baseClassPTNode, dstCGNode.getID());
             if (this.scale === PointerAnalysisConfig_1.PtaAnalysisScale.MethodLevel) {
                 srcNodes.push(...this.addStaticPagCallReturnEdge(staticCS, baseClassPTNode, calleeCid));
                 continue;
@@ -522,7 +540,7 @@ class PagBuilder {
         srcNodes.push(...this.addStaticPagCallEdge(staticCS, cid, calleeCid, ptNode));
         // Pass base's pts to callee's this pointer
         if (!dstCGNode.isSdkMethod() && ivkExpr instanceof Expr_1.ArkInstanceInvokeExpr) {
-            let srcBaseNode = this.addThisRefCallEdge(baseClassPTNode, cid, ivkExpr.getBase(), callee, calleeCid, staticCS.callerFuncID);
+            let srcBaseNode = this.addThisRefCallEdge(cid, ivkExpr.getBase(), callee, calleeCid, staticCS.callerFuncID);
             if (srcBaseNode !== -1) {
                 srcNodes.push(srcBaseNode);
             }
@@ -536,7 +554,7 @@ class PagBuilder {
             if (!(thisValue instanceof Local_1.Local)) {
                 return srcNodes;
             }
-            this.addThisRefCallEdge(baseClassPTNode, ptNode.getOriginCid(), thisValue, callee, calleeCid, staticCS.callerFuncID);
+            this.addThisRefCallEdge(ptNode.getOriginCid(), thisValue, callee, calleeCid, staticCS.callerFuncID);
         }
         return srcNodes;
     }
@@ -576,7 +594,7 @@ class PagBuilder {
                 break;
             case PTAUtils_1.BuiltApiType.FunctionBind:
                 /**
-                 * clone the function node and add the this pointer, origin callsite, args offset to it
+                 * clone the function node and add the this pointer, origin callSite, args offset to it
                  * let f = function.bind(thisArg, arg1, arg2, ...)
                  * f();
                  */
@@ -616,7 +634,7 @@ class PagBuilder {
     handleFunctionCall(staticCS, cid, calleeCid, realCallee, srcNodes, baseClassPTNode) {
         this.buildFuncPagAndAddToWorklist(new CSFuncID(calleeCid, staticCS.calleeFuncID));
         srcNodes.push(...this.addCallParamPagEdge(realCallee, staticCS.args, staticCS.callStmt, cid, calleeCid, 1));
-        this.addThisEdge(staticCS, cid, realCallee, srcNodes, baseClassPTNode, calleeCid);
+        this.addThisEdge(staticCS, cid, realCallee, srcNodes, calleeCid);
     }
     handleFunctionApply(staticCS, cid, calleeCid, realCallee, srcNodes, baseClassPTNode) {
         this.buildFuncPagAndAddToWorklist(new CSFuncID(calleeCid, staticCS.calleeFuncID));
@@ -626,7 +644,7 @@ class PagBuilder {
         }
         let argsRealValues = this.transferArrayValues(callerMethod, staticCS.args[1]);
         srcNodes.push(...this.addCallParamPagEdge(realCallee, argsRealValues, staticCS.callStmt, cid, calleeCid, 0));
-        this.addThisEdge(staticCS, cid, realCallee, srcNodes, baseClassPTNode, calleeCid);
+        this.addThisEdge(staticCS, cid, realCallee, srcNodes, calleeCid);
     }
     handleFunctionBind(staticCS, cid, baseClassPTNode, srcNodes) {
         let srcNode = this.pag.getOrClonePagFuncNode(baseClassPTNode);
@@ -641,9 +659,9 @@ class PagBuilder {
         srcNode.setArgsOffset(1);
         srcNode.setOriginCid(cid);
     }
-    addThisEdge(staticCS, cid, realCallee, srcNodes, baseClassPTNode, calleeCid) {
+    addThisEdge(staticCS, cid, realCallee, srcNodes, calleeCid) {
         if (!(staticCS.args[0] instanceof Constant_1.NullConstant) && !realCallee.isStatic()) {
-            let srcNodeID = this.addThisRefCallEdge(baseClassPTNode, cid, staticCS.args[0], realCallee, calleeCid, staticCS.callerFuncID);
+            let srcNodeID = this.addThisRefCallEdge(cid, staticCS.args[0], realCallee, calleeCid, staticCS.callerFuncID);
             if (srcNodeID !== -1) {
                 srcNodes.push(srcNodeID);
             }
@@ -701,8 +719,8 @@ class PagBuilder {
             logger.warn(`\tAdd call edge of unknown call ${callee.getSignature().toString()}`);
             this.cg.addDynamicCallEdge(callerNode.getID(), dstCGNode.getID(), cs.callStmt);
             if (!this.cg.detectReachable(dstCGNode.getID(), callerNode.getID())) {
-                let calleeCid = this.ctx.getOrNewContext(cid, dstCGNode.getID(), true);
-                let staticCS = new CallGraph_1.CallSite(cs.callStmt, cs.args, dstCGNode.getID(), cs.callerFuncID);
+                let staticCS = this.cg.getCallSiteManager().cloneCallSiteFromDyn(cs, dstCGNode.getID());
+                let calleeCid = this.ctxSelector.selectContext(cid, staticCS, ContextSelector_1.emptyID, staticCS.calleeFuncID);
                 let staticSrcNodes = this.addStaticPagCallEdge(staticCS, cid, calleeCid);
                 srcNodes.push(...staticSrcNodes);
             }
@@ -740,8 +758,8 @@ class PagBuilder {
         }
         return reAnalyzeNodes;
     }
-    addThisRefCallEdge(baseClassPTNode, cid, baseLocal, callee, calleeCid, callerFunID) {
-        let thisRefNodeID = this.recordThisRefNode(baseClassPTNode, callee, calleeCid);
+    addThisRefCallEdge(cid, baseLocal, callee, calleeCid, callerFunID) {
+        let thisRefNodeID = this.recordThisRefNode(callee, calleeCid);
         if (thisRefNodeID === -1) {
             return -1;
         }
@@ -763,7 +781,7 @@ class PagBuilder {
         this.pag.addPagEdge(this.pag.getNode(srcNodeId), thisRefNode, Pag_1.PagEdgeKind.This);
         return srcNodeId;
     }
-    recordThisRefNode(baseClassPTNode, callee, calleeCid) {
+    recordThisRefNode(callee, calleeCid) {
         var _a;
         if (!callee || !callee.getCfg()) {
             logger.error(`callee is null`);
@@ -775,21 +793,18 @@ class PagBuilder {
         if (!thisPtr) {
             throw new Error('Can not get this ptr');
         }
-        // IMPORTANT: set cid 2 base Pt info firstly
-        this.cid2ThisRefPtMap.set(calleeCid, baseClassPTNode);
-        let thisRefNode = this.getOrNewThisRefNode(calleeCid, thisPtr);
-        thisRefNode.addPTNode(baseClassPTNode);
+        let thisRefNode = this.getOrNewPagNode(calleeCid, thisPtr);
         return thisRefNode.getID();
     }
     /*
      * Add copy edges from arguments to parameters
-     *     ret edges from return values to callsite
+     *     ret edges from return values to callSite
      * Return src node
      */
     addStaticPagCallEdge(cs, callerCid, calleeCid, ptNode) {
         var _a, _b, _c, _d;
         if (!calleeCid) {
-            calleeCid = this.ctx.getOrNewContext(callerCid, cs.calleeFuncID, true);
+            calleeCid = this.ctxSelector.selectContext(callerCid, cs, ptNode ? ptNode.getID() : ContextSelector_1.emptyID, cs.calleeFuncID);
         }
         let srcNodes = [];
         // Add reachable
@@ -924,7 +939,7 @@ class PagBuilder {
     }
     addStaticPagCallReturnEdge(cs, callerCid, calleeCid) {
         if (!calleeCid) {
-            calleeCid = this.ctx.getOrNewContext(callerCid, cs.calleeFuncID, true);
+            calleeCid = this.ctxSelector.selectContext(callerCid, cs, ContextSelector_1.emptyID, cs.calleeFuncID);
         }
         let srcNodes = [];
         // Add reachable
@@ -1019,7 +1034,7 @@ class PagBuilder {
                 dstPagNode.setSdkParam();
                 let sdkParamInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkPtrInvokeExpr(arg.getType().getMethodSignature(), paramValue, []));
                 // create new DynCallSite
-                let sdkParamCallSite = new CallGraph_1.DynCallSite(sdkParamInvokeStmt, undefined, undefined, funcID);
+                let sdkParamCallSite = this.cg.getCallSiteManager().newDynCallSite(sdkParamInvokeStmt, undefined, undefined, funcID);
                 dstPagNode.addRelatedDynCallSite(sdkParamCallSite);
             }
             this.pag.addPagEdge(srcPagNode, dstPagNode, Pag_1.PagEdgeKind.Copy, cs.callStmt);
@@ -1028,55 +1043,19 @@ class PagBuilder {
         return srcNodes;
     }
     getOrNewPagNode(cid, v, s) {
-        if (v instanceof Ref_1.ArkThisRef) {
-            return this.getOrNewThisRefNode(cid, v);
-        }
-        // this local is also not uniq!!!
-        // remove below block once this issue fixed
         // globalThis process can not be removed while all `globalThis` ref is the same Value
-        if (v instanceof Local_1.Local) {
-            if (v.getName() === 'this') {
-                return this.getOrNewThisLoalNode(cid, v, s);
-            }
-            else if (v.getName() === TSConst_1.GLOBAL_THIS_NAME && v.getDeclaringStmt() == null) {
-                // globalThis node has no cid
-                return this.getOrNewGlobalThisNode(-1);
-            }
+        if (v instanceof Local_1.Local && v.getName() === TSConst_1.GLOBAL_THIS_NAME && v.getDeclaringStmt() == null) {
+            // globalThis node has no cid
+            return this.getOrNewGlobalThisNode(-1);
         }
         if (v instanceof Ref_1.ArkInstanceFieldRef || v instanceof Ref_1.ArkStaticFieldRef) {
             v = this.getRealInstanceRef(v);
         }
         return this.pag.getOrNewNode(cid, v, s);
     }
-    /**
-     * return ThisRef PAG node according to cid, a cid has a unique ThisRef node
-     * @param cid: current contextID
-     */
-    getOrNewThisRefNode(cid, v) {
-        let thisRefNodeID = this.cid2ThisRefMap.get(cid);
-        if (!thisRefNodeID) {
-            thisRefNodeID = -1;
-        }
-        let thisRefNode = this.pag.getOrNewThisRefNode(thisRefNodeID, v);
-        this.cid2ThisRefMap.set(cid, thisRefNode.getID());
-        return thisRefNode;
-    }
-    // TODO: remove it once this local not uniq issue is fixed
-    getOrNewThisLoalNode(cid, v, s) {
-        let thisLocalNodeID = this.cid2ThisLocalMap.get(cid);
-        if (thisLocalNodeID) {
-            return this.pag.getNode(thisLocalNodeID);
-        }
-        let thisNode = this.pag.getOrNewNode(cid, v, s);
-        this.cid2ThisLocalMap.set(cid, thisNode.getID());
-        return thisNode;
-    }
     getOrNewGlobalThisNode(cid) {
         return this.pag.getOrNewNode(cid, this.getGlobalThisValue());
     }
-    getUniqThisLocalNode(cid) {
-        return this.cid2ThisLocalMap.get(cid);
-    }
     /**
      * search the storage map to get propertyNode with given storage and propertyFieldName
      * @param storage storage type: AppStorage, LocalStorage etc.
@@ -1475,7 +1454,7 @@ class PagBuilder {
         var _a;
         funcPag.addDynamicCallSite(cs);
         this.pagStat.numDynamicCall++;
-        logger.trace('[add dynamic callsite] ' + cs.callStmt.toString() + ':  ' + ((_a = cs.callStmt.getCfg()) === null || _a === void 0 ? void 0 : _a.getDeclaringMethod().getSignature().toString()));
+        logger.trace('[add dynamic callSite] ' + cs.callStmt.toString() + ':  ' + ((_a = cs.callStmt.getCfg()) === null || _a === void 0 ? void 0 : _a.getDeclaringMethod().getSignature().toString()));
     }
     setPtForNode(node, pts) {
         if (!pts) {
@@ -1571,7 +1550,7 @@ class PagBuilder {
         let srcFunc = (_c = src.getDeclaringStmt()) === null || _c === void 0 ? void 0 : _c.getCfg().getDeclaringMethod();
         if (srcFunc) {
             let srcFuncID = this.cg.getCallGraphNodeByMethod(srcFunc.getSignature()).getID();
-            let cid = this.ctx.getNewContextID(srcFuncID);
+            let cid = this.ctxSelector.emptyContext(funcID);
             let csFuncID = new CSFuncID(cid, srcFuncID);
             this.buildFuncPagAndAddToWorklist(csFuncID);
         }
@@ -1696,5 +1675,8 @@ class PagBuilder {
         });
         return usedValuesInArray;
     }
+    getContextSelector() {
+        return this.ctxSelector;
+    }
 }
 exports.PagBuilder = PagBuilder;

package/lib/callgraph/pointerAnalysis/PointerAnalysis.d.ts

@@ -25,6 +25,7 @@ export declare class PointerAnalysis extends AbstractAnalysis {
     start(): void;
     private postProcess;
     getPTD(): DiffPTData<NodeID, NodeID, IPtsCollection<NodeID>>;
+    getPag(): Pag;
     getStat(): string;
     protected preProcessMethod(funcID: FuncID): CallSite[];
     setEntries(fIds: FuncID[]): void;
@@ -47,7 +48,7 @@ export declare class PointerAnalysis extends AbstractAnalysis {
     private propagate;
     /**
      * 1. 记录被更新的节点(记录cid, nodeid)
-     * 2. ( PAGLocalNode记录callsite(cid, value唯一))，通过1种的nodeID查询Node,拿到Callsite
+     * 2. ( PAGLocalNode记录callSite(cid, value唯一))，通过1种的nodeID查询Node,拿到CallSite
      * 3. 在addDynamicCall里对传入指针过滤（已处理指针和未处理指针）
      */
     private onTheFlyDynamicCallSolve;

package/lib/callgraph/pointerAnalysis/PointerAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PointerAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/pointerAnalysis/PointerAnalysis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PointerAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/pointerAnalysis/PointerAnalysis.ts"],"names":[],"mappings":"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"}

package/lib/callgraph/pointerAnalysis/PointerAnalysis.js

@@ -61,7 +61,7 @@ class PointerAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
         super(s, cg);
         this.pag = p;
         this.ptd = new PtsDS_1.DiffPTData(config.ptsCollectionCtor);
-        this.pagBuilder = new PagBuilder_1.PagBuilder(this.pag, this.cg, s, config.kLimit, config.analysisScale);
+        this.pagBuilder = new PagBuilder_1.PagBuilder(this.pag, this.cg, s, config);
         this.cgBuilder = new CallGraphBuilder_1.CallGraphBuilder(this.cg, s);
         this.ptaStat = new Statistics_1.PTAStat(this);
         this.config = config;
@@ -125,13 +125,17 @@ class PointerAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
             this.pag.dump(path_1.default.join(this.config.outputDirectory, 'ptaEnd_pag.dot'));
             this.cg.dump(path_1.default.join(this.config.outputDirectory, 'cgEnd.dot'));
         }
-        if (this.config.unhandledFuncDump) {
+        if (this.config.debug) {
             this.dumpUnhandledFunctions();
+            this.pagBuilder.getContextSelector().dump(this.config.outputDirectory, this.cg);
         }
     }
     getPTD() {
         return this.ptd;
     }
+    getPag() {
+        return this.pag;
+    }
     getStat() {
         let ret = this.cg.getStat();
         ret += '\n' + this.pagBuilder.getStat();
@@ -348,7 +352,7 @@ class PointerAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
     }
     /**
      * 1. 记录被更新的节点(记录cid, nodeid)
-     * 2. ( PAGLocalNode记录callsite(cid, value唯一))，通过1种的nodeID查询Node,拿到Callsite
+     * 2. ( PAGLocalNode记录callSite(cid, value唯一))，通过1种的nodeID查询Node,拿到CallSite
      * 3. 在addDynamicCall里对传入指针过滤（已处理指针和未处理指针）
      */
     onTheFlyDynamicCallSolve() {
@@ -377,13 +381,13 @@ class PointerAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
             logger.warn(`node ${node.getID()} has no related dynamic call site`);
             return changed;
         }
-        logger.info(`[process dynamic callsite] node ${node.getID()}`);
-        dynCallSites.forEach(dynCallsite => {
+        logger.info(`[process dynamic callSite] node ${node.getID()}`);
+        dynCallSites.forEach(dynCallSite => {
             for (let pt of pts) {
-                let srcNodes = this.pagBuilder.addDynamicCallEdge(dynCallsite, pt, node.getCid());
+                let srcNodes = this.pagBuilder.addDynamicCallEdge(dynCallSite, pt, node.getCid());
                 changed = this.addToReanalyze(srcNodes) || changed;
             }
-            processedCallSites.add(dynCallsite);
+            processedCallSites.add(dynCallSite);
         });
         return changed;
     }
@@ -394,7 +398,7 @@ class PointerAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
             logger.warn(`node ${node.getID()} has no related unknown call site`);
             return changed;
         }
-        logger.info(`[process unknown callsite] node ${node.getID()}`);
+        logger.info(`[process unknown callSite] node ${node.getID()}`);
         unknownCallSites.forEach(unknownCallSite => {
             for (let pt of pts) {
                 let srcNodes = this.pagBuilder.addDynamicCallEdge(unknownCallSite, pt, node.getCid());

package/lib/callgraph/pointerAnalysis/PointerAnalysisConfig.d.ts

@@ -4,19 +4,25 @@ export declare enum PtaAnalysisScale {
     WholeProgram = 0,
     MethodLevel = 1
 }
+export declare enum ContextType {
+    CallSite = 0,
+    Obj = 1,
+    Func = 2
+}
 export declare class PointerAnalysisConfig {
     private static instance;
     kLimit: number;
+    contextType: ContextType;
     outputDirectory: string;
     detectTypeDiff: boolean;
     dotDump: boolean;
-    unhandledFuncDump: boolean;
+    debug: boolean;
     analysisScale: PtaAnalysisScale;
     ptsCollectionType: PtsCollectionType;
     ptsCollectionCtor: new () => IPtsCollection<NodeID>;
-    constructor(kLimit: number, outputDirectory: string, detectTypeDiff?: boolean, dotDump?: boolean, unhandledFuncDump?: boolean, analysisScale?: PtaAnalysisScale, ptsCoType?: PtsCollectionType);
+    constructor(kLimit: number, contextType: ContextType, outputDirectory: string, detectTypeDiff?: boolean, dotDump?: boolean, debug?: boolean, analysisScale?: PtaAnalysisScale, ptsCoType?: PtsCollectionType);
     static dispose(): void;
-    static create(kLimit: number, outputDirectory: string, detectTypeDiff?: boolean, dotDump?: boolean, unhandledFuncDump?: boolean, analysisScale?: PtaAnalysisScale, ptsCoType?: PtsCollectionType): PointerAnalysisConfig;
+    static create(kLimit: number, outputDirectory: string, detectTypeDiff?: boolean, dotDump?: boolean, debug?: boolean, analysisScale?: PtaAnalysisScale, ptsCoType?: PtsCollectionType, contextType?: ContextType): PointerAnalysisConfig;
     static getInstance(): PointerAnalysisConfig;
 }
 //# sourceMappingURL=PointerAnalysisConfig.d.ts.map