arkanalyzer 1.0.6 → 1.0.8

package/lib/core/common/ArkIRTransformer.js

@@ -37,7 +37,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkIRTransformer = exports.DUMMY_INITIALIZER_STMT = void 0;
+exports.ArkIRTransformer = exports.DummyStmt = void 0;
 const Expr_1 = require("../base/Expr");
 const Ref_1 = require("../base/Ref");
 const ts = __importStar(require("ohos-typescript"));
@@ -59,16 +59,27 @@ const Position_1 = require("../base/Position");
 const ModelUtils_1 = require("./ModelUtils");
 const Builtin_1 = require("./Builtin");
 const TSConst_1 = require("./TSConst");
+const builderUtils_1 = require("../model/builder/builderUtils");
+const Const_1 = require("./Const");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkIRTransformer');
-exports.DUMMY_INITIALIZER_STMT = 'dummyInitializerStmt';
+class DummyStmt extends Stmt_1.Stmt {
+    constructor(text) {
+        super();
+        this.text = text;
+    }
+    toString() {
+        return this.text;
+    }
+}
+exports.DummyStmt = DummyStmt;
 class ArkIRTransformer {
     constructor(sourceFile, declaringMethod) {
-        this.tempLocalPrefix = '$temp';
-        this.tempLocalIndex = 0;
+        this.conditionalOperatorNo = 0;
+        this.tempLocalNo = 0;
         this.locals = new Map();
         this.inBuilderMethod = false;
-        this.stmtToOriginalStmt = new Map();
         this.aliasTypeMap = new Map();
+        this.stmtsHaveOriginalText = new Set();
         this.builderMethodContextFlag = false;
         this.sourceFile = sourceFile;
         this.declaringMethod = declaringMethod;
@@ -82,9 +93,6 @@ class ArkIRTransformer {
     getThisLocal() {
         return this.thisLocal;
     }
-    getStmtToOriginalStmt() {
-        return this.stmtToOriginalStmt;
-    }
     getAliasTypeMap() {
         return this.aliasTypeMap;
     }
@@ -147,9 +155,24 @@ class ArkIRTransformer {
         else if (ts.isReturnStatement(node)) {
             stmts = this.returnStatementToStmts(node);
         }
+        else if (ts.isFunctionDeclaration(node)) {
+            stmts = this.functionDeclarationToStmts(node);
+        }
         this.mapStmtsToTsStmt(stmts, node);
+        if (stmts.length > 0) {
+            IRUtils_1.IRUtils.setLeadingComments(stmts[0], node, this.sourceFile, this.declaringMethod.getDeclaringArkFile().getScene().getOptions());
+        }
         return stmts;
     }
+    functionDeclarationToStmts(functionDeclarationNode) {
+        const declaringClass = this.declaringMethod.getDeclaringArkClass();
+        const arkMethod = new ArkMethod_1.ArkMethod();
+        if (this.builderMethodContextFlag) {
+            ModelUtils_1.ModelUtils.implicitArkUIBuilderMethods.add(arkMethod);
+        }
+        (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(functionDeclarationNode, declaringClass, arkMethod, this.sourceFile, this.declaringMethod);
+        return [];
+    }
     returnStatementToStmts(returnStatement) {
         const stmts = [];
         if (returnStatement.expression) {
@@ -217,6 +240,8 @@ class ArkIRTransformer {
         const aliasName = typeAliasDeclaration.name.text;
         const originalType = this.resolveTypeNode(typeAliasDeclaration.type);
         const aliasType = new Type_1.AliasType(aliasName, originalType, new ArkSignature_1.LocalSignature(aliasName, this.declaringMethod.getSignature()));
+        const modifiers = typeAliasDeclaration.modifiers ? (0, builderUtils_1.buildModifiers)(typeAliasDeclaration) : 0;
+        aliasType.setModifiers(modifiers);
         const sourceCode = typeAliasDeclaration.getText(this.sourceFile);
         const aliasTypePosition = Position_1.LineColPosition.buildFromNode(typeAliasDeclaration, this.sourceFile);
         const aliasTypeDeclaration = new Type_1.AliasTypeDeclaration(sourceCode, aliasTypePosition);
@@ -252,7 +277,7 @@ class ArkIRTransformer {
         if (forStatement.initializer) {
             stmts.push(...this.tsNodeToValueAndStmts(forStatement.initializer).stmts);
         }
-        const dummyInitializerStmt = new Stmt_1.OriginalStmt(exports.DUMMY_INITIALIZER_STMT, Position_1.LineColPosition.DEFAULT);
+        const dummyInitializerStmt = new DummyStmt(ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT);
         stmts.push(dummyInitializerStmt);
         if (forStatement.condition) {
             const { value: conditionValue, stmts: conditionStmts, } = this.conditionToValueAndStmts(forStatement.condition);
@@ -308,7 +333,7 @@ class ArkIRTransformer {
         const castExprPositions = [yieldValuePositions[0], ...yieldValuePositions];
         if (ts.isVariableDeclarationList(forOfStatement.initializer)) {
             const variableDeclarationList = forOfStatement.initializer;
-            const isConst = (variableDeclarationList.flags & ts.NodeFlags.Const) != 0;
+            const isConst = (variableDeclarationList.flags & ts.NodeFlags.Const) !== 0;
             const variableDeclaration = variableDeclarationList.declarations[0];
             if (ts.isArrayBindingPattern(variableDeclaration.name)) {
                 const { value: arrayItem, valueOriginalPositions: arrayItemPositions, stmts: arrayItemStmts, } = this.generateAssignStmtForValue(castExpr, castExprPositions);
@@ -317,7 +342,7 @@ class ArkIRTransformer {
                 const elements = variableDeclaration.name.elements;
                 let index = 0;
                 for (const element of elements) {
-                    const arrayRef = new Ref_1.ArkArrayRef(arrayItem, new Constant_1.Constant(index.toString(), Type_1.NumberType.getInstance()));
+                    const arrayRef = new Ref_1.ArkArrayRef(arrayItem, ValueUtil_1.ValueUtil.getOrCreateNumberConst(index));
                     const arrayRefPositions = [arrayItemPositions[0], ...arrayItemPositions, Position_1.FullPosition.DEFAULT];
                     const item = new Local_1.Local(element.getText(this.sourceFile));
                     const itemPosition = Position_1.FullPosition.buildFromNode(element, this.sourceFile);
@@ -362,7 +387,7 @@ class ArkIRTransformer {
     }
     whileStatementToStmts(whileStatement) {
         const stmts = [];
-        const dummyInitializerStmt = new Stmt_1.OriginalStmt(exports.DUMMY_INITIALIZER_STMT, Position_1.LineColPosition.DEFAULT);
+        const dummyInitializerStmt = new DummyStmt(ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT);
         stmts.push(dummyInitializerStmt);
         const { value: conditionExpr, stmts: conditionStmts, } = this.conditionToValueAndStmts(whileStatement.expression);
         stmts.push(...conditionStmts);
@@ -544,23 +569,29 @@ class ArkIRTransformer {
         };
     }
     conditionalExpressionToValueAndStmts(conditionalExpression) {
-        // TODO: separated by blocks
         const stmts = [];
+        const currConditionalOperatorIndex = this.conditionalOperatorNo++;
         const { value: conditionValue, valueOriginalPositions: conditionPositions, stmts: conditionStmts, } = this.conditionToValueAndStmts(conditionalExpression.condition);
         stmts.push(...conditionStmts);
         const ifStmt = new Stmt_1.ArkIfStmt(conditionValue);
         ifStmt.setOperandOriginalPositions(conditionPositions);
         stmts.push(ifStmt);
+        stmts.push(new DummyStmt(ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT + currConditionalOperatorIndex));
         const { value: whenTrueValue, valueOriginalPositions: whenTruePositions, stmts: whenTrueStmts } = this.tsNodeToValueAndStmts(conditionalExpression.whenTrue);
         stmts.push(...whenTrueStmts);
-        const { value: resultValue, valueOriginalPositions: resultPositions, stmts: tempStmts, } = this.generateAssignStmtForValue(whenTrueValue, whenTruePositions);
-        stmts.push(...tempStmts);
+        const resultLocal = this.generateTempLocal();
+        const assignStmtWhenTrue = new Stmt_1.ArkAssignStmt(resultLocal, whenTrueValue);
+        const resultLocalPosition = [whenTruePositions[0]];
+        assignStmtWhenTrue.setOperandOriginalPositions([...resultLocalPosition, ...whenTruePositions]);
+        stmts.push(assignStmtWhenTrue);
+        stmts.push(new DummyStmt(ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT + currConditionalOperatorIndex));
         const { value: whenFalseValue, valueOriginalPositions: whenFalsePositions, stmts: whenFalseStmts, } = this.tsNodeToValueAndStmts(conditionalExpression.whenFalse);
         stmts.push(...whenFalseStmts);
-        const assignStmt = new Stmt_1.ArkAssignStmt(resultValue, whenFalseValue);
-        assignStmt.setOperandOriginalPositions([...resultPositions, ...whenFalsePositions]);
+        const assignStmt = new Stmt_1.ArkAssignStmt(resultLocal, whenFalseValue);
+        assignStmt.setOperandOriginalPositions([...resultLocalPosition, ...whenFalsePositions]);
         stmts.push(assignStmt);
-        return { value: resultValue, valueOriginalPositions: resultPositions, stmts: stmts };
+        stmts.push(new DummyStmt(ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT + currConditionalOperatorIndex));
+        return { value: resultLocal, valueOriginalPositions: resultLocalPosition, stmts: stmts };
     }
     objectLiteralExpresionToValueAndStmts(objectLiteralExpression) {
         const declaringArkClass = this.declaringMethod.getDeclaringArkClass();
@@ -611,9 +642,9 @@ class ArkIRTransformer {
         const createViewArgPositionsAll = [newExprPositions];
         if (ts.isEtsComponentExpression(componentExpression) && componentExpression.body) {
             const anonymous = ts.factory.createArrowFunction([], [], [], undefined, undefined, componentExpression.body);
-            // @ts-ignore
+            // @ts-expect-error: add pos info for the created ArrowFunction
             anonymous.pos = componentExpression.body.pos;
-            // @ts-ignore
+            // @ts-expect-error: add end info for the created ArrowFunction
             anonymous.end = componentExpression.body.end;
             const { value: builderMethod, valueOriginalPositions: builderMethodPositions, } = this.callableNodeToValueAndStmts(anonymous);
             createViewArgs.push(builderMethod);
@@ -635,7 +666,7 @@ class ArkIRTransformer {
     etsComponentExpressionToValueAndStmts(etsComponentExpression) {
         const stmts = [];
         const componentName = etsComponentExpression.expression.text;
-        let builderMethodIndexes = undefined;
+        let builderMethodIndexes;
         if (componentName === EtsConst_1.COMPONENT_FOR_EACH || componentName === EtsConst_1.COMPONENT_LAZY_FOR_EACH) {
             builderMethodIndexes = new Set([1]);
         }
@@ -730,7 +761,7 @@ class ArkIRTransformer {
         // TODO: handle global variable
         let identifierValue;
         let identifierPositions = [Position_1.FullPosition.buildFromNode(identifier, this.sourceFile)];
-        if (identifier.text == Type_1.UndefinedType.getInstance().getName()) {
+        if (identifier.text === Type_1.UndefinedType.getInstance().getName()) {
             identifierValue = ValueUtil_1.ValueUtil.getUndefinedConst();
         }
         else {
@@ -787,11 +818,10 @@ class ArkIRTransformer {
         return { value: elementAccessExpr, valueOriginalPositions: exprPositions, stmts: stmts };
     }
     callExpressionToValueAndStmts(callExpression) {
-        let realGenericTypes = undefined;
+        let realGenericTypes;
         if (callExpression.typeArguments) {
             realGenericTypes = [];
             callExpression.typeArguments.forEach(typeArgument => {
-                // @ts-ignore
                 realGenericTypes.push(this.resolveTypeNode(typeArgument));
             });
         }
@@ -869,7 +899,6 @@ class ArkIRTransformer {
             ModelUtils_1.ModelUtils.implicitArkUIBuilderMethods.add(arrowArkMethod);
         }
         (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(callableNode, declaringClass, arrowArkMethod, this.sourceFile, this.declaringMethod);
-        declaringClass.addMethod(arrowArkMethod);
         const callableType = new Type_1.FunctionType(arrowArkMethod.getSignature());
         const callableValue = this.getOrCreatLocal(arrowArkMethod.getName(), callableType);
         return {
@@ -884,11 +913,10 @@ class ArkIRTransformer {
             return this.newArrayExpressionToValueAndStmts(newExpression);
         }
         const stmts = [];
-        let realGenericTypes = undefined;
+        let realGenericTypes;
         if (newExpression.typeArguments) {
             realGenericTypes = [];
             newExpression.typeArguments.forEach(typeArgument => {
-                // @ts-ignore
                 realGenericTypes.push(this.resolveTypeNode(typeArgument));
             });
         }
@@ -969,7 +997,7 @@ class ArkIRTransformer {
             elementPositonsAll.push(elementPosition);
         }
         let baseType = Type_1.AnyType.getInstance();
-        if (elementTypes.size == 1) {
+        if (elementTypes.size === 1) {
             baseType = elementTypes.keys().next().value;
         }
         else if (elementTypes.size > 1) {
@@ -1148,7 +1176,7 @@ class ArkIRTransformer {
             rightValue = tempRightValue;
             rightPositions = tempRightPositions;
         }
-        const isConst = (nodeFlag & ts.NodeFlags.Const) != 0;
+        const isConst = (nodeFlag & ts.NodeFlags.Const) !== 0;
         if (leftValue instanceof Local_1.Local) {
             leftValue.setConstFlag(isConst);
             if (variableDeclaration.type) {
@@ -1166,7 +1194,7 @@ class ArkIRTransformer {
             const elements = leftOpNode.elements;
             let index = 0;
             for (const element of elements) {
-                const arrayRef = new Ref_1.ArkArrayRef(leftValue, new Constant_1.Constant(index.toString(), Type_1.NumberType.getInstance()));
+                const arrayRef = new Ref_1.ArkArrayRef(leftValue, ValueUtil_1.ValueUtil.getOrCreateNumberConst(index));
                 const arrayRefPositions = [leftPositions[0], ...leftPositions, Position_1.FullPosition.DEFAULT];
                 const item = new Local_1.Local(element.getText(this.sourceFile));
                 const itemPosition = Position_1.FullPosition.buildFromNode(element, this.sourceFile);
@@ -1346,6 +1374,8 @@ class ArkIRTransformer {
                 return Expr_1.NormalBinaryOperator.LogicalAnd;
             case ts.SyntaxKind.BarBarEqualsToken:
                 return Expr_1.NormalBinaryOperator.LogicalOr;
+            default:
+                ;
         }
         return null;
     }
@@ -1424,8 +1454,8 @@ class ArkIRTransformer {
         return local;
     }
     generateTempLocal(localType = Type_1.UnknownType.getInstance()) {
-        const tempLocalName = this.tempLocalPrefix + this.tempLocalIndex;
-        this.tempLocalIndex++;
+        const tempLocalName = Const_1.TEMP_LOCAL_PREFIX + this.tempLocalNo;
+        this.tempLocalNo++;
         const tempLocal = new Local_1.Local(tempLocalName, localType);
         this.locals.set(tempLocalName, tempLocal);
         return tempLocal;
@@ -1438,14 +1468,14 @@ class ArkIRTransformer {
         return { value: leftOp, valueOriginalPositions: [leftOpPosition], stmts: [assignStmt] };
     }
     isRelationalOperator(operator) {
-        return operator == Expr_1.RelationalBinaryOperator.LessThan ||
-            operator == Expr_1.RelationalBinaryOperator.LessThanOrEqual ||
-            operator == Expr_1.RelationalBinaryOperator.GreaterThan ||
-            operator == Expr_1.RelationalBinaryOperator.GreaterThanOrEqual ||
-            operator == Expr_1.RelationalBinaryOperator.Equality ||
-            operator == Expr_1.RelationalBinaryOperator.InEquality ||
-            operator == Expr_1.RelationalBinaryOperator.StrictEquality ||
-            operator == Expr_1.RelationalBinaryOperator.StrictInequality;
+        return operator === Expr_1.RelationalBinaryOperator.LessThan ||
+            operator === Expr_1.RelationalBinaryOperator.LessThanOrEqual ||
+            operator === Expr_1.RelationalBinaryOperator.GreaterThan ||
+            operator === Expr_1.RelationalBinaryOperator.GreaterThanOrEqual ||
+            operator === Expr_1.RelationalBinaryOperator.Equality ||
+            operator === Expr_1.RelationalBinaryOperator.InEquality ||
+            operator === Expr_1.RelationalBinaryOperator.StrictEquality ||
+            operator === Expr_1.RelationalBinaryOperator.StrictInequality;
     }
     resolveTypeNode(type) {
         const kind = type.kind;
@@ -1468,17 +1498,19 @@ class ArkIRTransformer {
                 return this.resolveTypeReferenceNode(type);
             case ts.SyntaxKind.ArrayType:
                 return new Type_1.ArrayType(this.resolveTypeNode(type.elementType), 1);
-            case ts.SyntaxKind.UnionType:
+            case ts.SyntaxKind.UnionType: {
                 const cur = type;
                 const mayTypes = [];
                 cur.types.forEach(t => mayTypes.push(this.resolveTypeNode(t)));
                 return new Type_1.UnionType(mayTypes);
-            case ts.SyntaxKind.TupleType:
+            }
+            case ts.SyntaxKind.TupleType: {
                 const types = [];
                 type.elements.forEach(element => {
                     types.push(this.resolveTypeNode(element));
                 });
                 return new Type_1.TupleType(types);
+            }
             case ts.SyntaxKind.NamedTupleMember:
                 return this.resolveTypeNode(type.type);
             case ts.SyntaxKind.LiteralType:
@@ -1489,6 +1521,8 @@ class ArkIRTransformer {
                 return this.resolveTypeLiteralNode(type);
             case ts.SyntaxKind.FunctionType:
                 return this.resolveFunctionTypeNode(type);
+            default:
+                ;
         }
         return Type_1.UnknownType.getInstance();
     }
@@ -1506,6 +1540,8 @@ class ArkIRTransformer {
                 return new Type_1.LiteralType(parseFloat(literal.text));
             case ts.SyntaxKind.PrefixUnaryExpression:
                 return new Type_1.LiteralType(parseFloat(literal.getText(this.sourceFile)));
+            default:
+                ;
         }
         return new Type_1.LiteralType(literal.getText(this.sourceFile));
     }
@@ -1601,10 +1637,11 @@ class ArkIRTransformer {
         return false;
     }
     mapStmtsToTsStmt(stmts, node) {
-        const originalStmt = new Stmt_1.OriginalStmt(node.getText(this.sourceFile), Position_1.LineColPosition.buildFromNode(node, this.sourceFile));
         for (const stmt of stmts) {
-            if (!this.stmtToOriginalStmt.has(stmt)) {
-                this.stmtToOriginalStmt.set(stmt, originalStmt);
+            if (!this.stmtsHaveOriginalText.has(stmt)) {
+                this.stmtsHaveOriginalText.add(stmt);
+                stmt.setOriginPositionInfo(Position_1.LineColPosition.buildFromNode(node, this.sourceFile));
+                stmt.setOriginalText(node.getText(this.sourceFile));
             }
         }
     }
@@ -1616,6 +1653,8 @@ class ArkIRTransformer {
                 return Expr_1.UnaryOperator.BitwiseNot;
             case ts.SyntaxKind.ExclamationToken:
                 return Expr_1.UnaryOperator.LogicalNot;
+            default:
+                ;
         }
         return null;
     }
@@ -1667,8 +1706,14 @@ class ArkIRTransformer {
                 return Expr_1.RelationalBinaryOperator.StrictEquality;
             case ts.SyntaxKind.ExclamationEqualsEqualsToken:
                 return Expr_1.RelationalBinaryOperator.StrictInequality;
+            default:
+                ;
         }
         return null;
     }
 }
 exports.ArkIRTransformer = ArkIRTransformer;
+ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT = 'LoopInitializer';
+ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT = 'ConditionalOperatorIfTrue';
+ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT = 'ConditionalOperatorIfFalse';
+ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT = 'ConditionalOperatorEnd';

package/lib/core/common/BodyBuilder.d.ts

@@ -1,10 +1,12 @@
 import { ArkBody } from '../model/ArkBody';
 import { ArkMethod } from '../model/ArkMethod';
 import { MethodSignature } from '../model/ArkSignature';
+import { CfgBuilder } from './CfgBuilder';
 import * as ts from 'ohos-typescript';
 export declare class BodyBuilder {
     private cfgBuilder;
     constructor(methodSignature: MethodSignature, sourceAstNode: ts.Node, declaringMethod: ArkMethod, sourceFile: ts.SourceFile);
     build(): ArkBody | null;
+    getCfgBuilder(): CfgBuilder;
 }
 //# sourceMappingURL=BodyBuilder.d.ts.map

package/lib/core/common/BodyBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../src/core/common/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEnB,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;CAUjC"}
+{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../src/core/common/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEnB,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAWvB,aAAa,IAAI,UAAU;CAGrC"}

package/lib/core/common/BodyBuilder.js

@@ -24,11 +24,14 @@ class BodyBuilder {
     build() {
         this.cfgBuilder.buildCfgBuilder();
         if (!this.cfgBuilder.isBodyEmpty()) {
-            const { cfg, originalCfg, stmtToOriginalStmt, locals, aliasTypeMap } = this.cfgBuilder.buildCfgAndOriginalCfg();
+            const { cfg, locals, aliasTypeMap } = this.cfgBuilder.buildCfgAndOriginalCfg();
             cfg.buildDefUseStmt();
-            return new ArkBody_1.ArkBody(locals, originalCfg, cfg, stmtToOriginalStmt, aliasTypeMap);
+            return new ArkBody_1.ArkBody(locals, cfg, aliasTypeMap);
         }
         return null;
     }
+    getCfgBuilder() {
+        return this.cfgBuilder;
+    }
 }
 exports.BodyBuilder = BodyBuilder;

package/lib/core/common/Builtin.js

@@ -57,7 +57,7 @@ Builtin.BUILT_IN_CLASSES = _a.buildBuiltInClasses();
 // signature for built-in class
 Builtin.DUMMY_PROJECT_NAME = 'ES2015';
 Builtin.DUMMY_FILE_NAME = 'BuiltinClass';
-Builtin.BUILT_IN_CLASSES_FILE_SIGNATURE = _a.buildBuiltInClassesFileSignature();
+Builtin.BUILT_IN_CLASSES_FILE_SIGNATURE = Builtin.buildBuiltInClassesFileSignature();
 Builtin.OBJECT_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.OBJECT);
 Builtin.ARRAY_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.ARRAY);
 Builtin.SET_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.SET);

package/lib/core/common/CfgBuilder.d.ts

@@ -1,6 +1,5 @@
 import * as ts from 'ohos-typescript';
 import { Local } from '../base/Local';
-import { Stmt } from '../base/Stmt';
 import { Cfg } from '../graph/Cfg';
 import { ArkClass } from '../model/ArkClass';
 import { ArkMethod } from '../model/ArkMethod';
@@ -111,26 +110,32 @@ export declare class CfgBuilder {
     isBodyEmpty(): boolean;
     buildCfgAndOriginalCfg(): {
         cfg: Cfg;
-        originalCfg: Cfg;
-        stmtToOriginalStmt: Map<Stmt, Stmt>;
         locals: Set<Local>;
         aliasTypeMap: Map<string, [AliasType, AliasTypeDeclaration]>;
     };
     buildCfgAndOriginalCfgForSimpleArrowFunction(): {
         cfg: Cfg;
-        originalCfg: Cfg;
-        stmtToOriginalStmt: Map<Stmt, Stmt>;
         locals: Set<Local>;
         aliasTypeMap: Map<string, [AliasType, AliasTypeDeclaration]>;
     };
     buildNormalCfgAndOriginalCfg(): {
         cfg: Cfg;
-        originalCfg: Cfg;
-        stmtToOriginalStmt: Map<Stmt, Stmt>;
         locals: Set<Local>;
         aliasTypeMap: Map<string, [AliasType, AliasTypeDeclaration]>;
     };
+    private linkBasicBlocks;
+    private rebuildBlocksInConditionalOperator;
+    private traverseAndRebuildConditionalOperator;
+    private findConditionalOperator;
+    private adjustSuccessorOfConditionalOperator;
+    private removeUnnecessaryBlocksInConditionalOperator;
+    private replaceTempResultcursively;
+    private isNewDefLocal;
+    private rebuildBlocksInLoop;
+    private doesPrevBlockBuilderContainLoop;
     private insertBeforeConditionBlockBuilder;
+    private findIteratorIdx;
+    private adjustIncrementorStmts;
 }
 export {};
 //# sourceMappingURL=CfgBuilder.d.ts.map

package/lib/core/common/CfgBuilder.d.ts.map

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