arkanalyzer 1.0.94 → 2.0.0-beta1

package/lib/frontend/cppFrontend/common/ModelUtils.js

@@ -42,6 +42,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CxxModelUtils = exports.setTs2CxxFuncMapOfClass = exports.shouldAddCxxHeaderImport = exports.findExportInfo = exports.getArkFile = void 0;
 const ArkFile_1 = require("../../../core/model/ArkFile");
+const SdkUtils_1 = require("../../../core/common/SdkUtils");
 const ArkSignature_1 = require("../../../core/model/ArkSignature");
 const ArkExport_1 = require("../../../core/model/ArkExport");
 const logger_1 = __importStar(require("../../../utils/logger"));
@@ -56,6 +57,7 @@ const Const_1 = require("../../../core/common/Const");
 const Type_1 = require("../../../core/base/Type");
 const ArkNamespace_1 = require("../../../core/model/ArkNamespace");
 const ModelUtils_1 = require("../../../core/common/ModelUtils");
+const Const_2 = require("../../../core/common/Const");
 const TypeInference_1 = require("../../../core/common/TypeInference");
 const Type_2 = require("../base/Type");
 // Common C++standard library header files (excluding the .h suffix)
@@ -424,7 +426,7 @@ class CxxModelUtils {
         const clsDeclareSignature = arkClass.getDeclareSignature();
         let declClass;
         if (clsDeclareSignature) {
-            declClass = (_e = arkClass.getDeclaringArkFile().getScene().getFile(clsDeclareSignature.getDeclaringFileSignature())) === null || _e === void 0 ? void 0 : _e.getClass(clsDeclareSignature);
+            declClass = (_e = arkClass.getDeclaringArkFile().getScene().getFile(clsDeclareSignature.getDeclaringFileSigID())) === null || _e === void 0 ? void 0 : _e.getClass(clsDeclareSignature);
         }
         const heritageClasses = arkClass.getAllHeritageClasses();
         if (declClass) {
@@ -440,7 +442,7 @@ class CxxModelUtils {
                 return property;
             }
         }
-        const objectClass = arkClass.getDeclaringArkFile().getScene().getSdkGlobal('Object');
+        const objectClass = SdkUtils_1.SdkUtils.getSdkGlobal('Object');
         if (objectClass instanceof ArkClass_1.ArkClass && arkClass !== objectClass) {
             return this.findPropertyInClass(name, objectClass);
         }
@@ -459,7 +461,7 @@ class CxxModelUtils {
     static getStaticMethodWithName(methodName, thisClass) {
         const thisNamespace = thisClass.getDeclaringArkNamespace();
         if (thisNamespace) {
-            const defaultClass = thisNamespace.getClassWithName(Const_1.DEFAULT_ARK_CLASS_NAME);
+            const defaultClass = thisNamespace.getDefaultClass();
             if (defaultClass) {
                 const method = defaultClass.getMethodWithName(methodName);
                 if (method) {
@@ -507,6 +509,79 @@ class CxxModelUtils {
         }
         return undefined;
     }
+    /**
+     * Resolve a nested class / local class referenced by its short (unqualified) name.
+     *
+     * C++ name lookup makes nested classes visible by their bare name inside the
+     * enclosing class, but the analyzer stores them under a composed top-level name
+     * (`Inner$Outer`, multi-level chains like `I$I2$Outer`, method-local classes as
+     * `L$Cls.m`). Instead of fuzzy prefix matching on the container's class list,
+     * this walks the enclosing-name chain of the context class and resolves each
+     * candidate by an exact ClassSignature lookup (O(1) per candidate).
+     *
+     * Candidate order follows C++ scoping (innermost first), so a same-name nested
+     * class correctly shadows an outer/top-level class.
+     * @param shortName - the bare source name of the nested class
+     * @param ctxClass - the class where the reference occurs (scope context)
+     * @param ctxMethod - optional; the method where the reference occurs. When present,
+     *        classes declared inside the method body (`L$Cls.m`) are also considered.
+     * @returns The matching ArkClass, or null when no candidate resolves.
+     */
+    static findClassByShortName(shortName, ctxClass, ctxMethod) {
+        if (!shortName || shortName.includes(Const_1.NAME_DELIMITER)) {
+            return null;
+        }
+        // Enclosing-name chain: 'I2$Outer' -> ['I2$Outer', 'Outer']; top-level 'Outer' -> ['Outer']. `%dflt`（file 级函数的容器）放行——cpp 方法局部类
+        // 挂载约定为 `short$%dflt.method`，排除它会使顶层函数上下文的局部类候选链恒空（structBinding Person %unk 实证）。其余 % 前缀合成名
+        // （%AC0 匿名类等）仍排除；%dflt 无 $ 分隔符，下钻循环自然终止。
+        const enclosingChain = [];
+        let scopeName = ctxClass.getName();
+        while (scopeName && scopeName.length > 0 && (!scopeName.startsWith('%') || scopeName === Const_2.DEFAULT_ARK_CLASS_NAME)) {
+            enclosingChain.push(scopeName);
+            const idx = scopeName.indexOf(Const_1.NAME_DELIMITER);
+            if (idx <= 0) {
+                break;
+            }
+            scopeName = scopeName.substring(idx + 1);
+        }
+        if (enclosingChain.length === 0) {
+            return null;
+        }
+        const file = ctxClass.getDeclaringArkFile();
+        const ns = ctxClass.getDeclaringArkNamespace();
+        const fileID = ns ? ns.getDeclaringFileID() : file.getFileSigID();
+        const nsSigID = ns ? ns.getNamespaceSigID() : undefined;
+        const tryCandidates = (candidates) => {
+            for (const candidate of candidates) {
+                const cls = ns ? ns.getClass(new ArkSignature_1.ClassSignature(candidate, fileID, nsSigID)) : file.getClass(new ArkSignature_1.ClassSignature(candidate, fileID));
+                if (cls) {
+                    return cls;
+                }
+            }
+            return null;
+        };
+        // 1. Nested classes inside the enclosing chain (innermost scope first).
+        const nestedCandidates = [];
+        for (const enclosing of enclosingChain) {
+            nestedCandidates.push(shortName + Const_1.NAME_DELIMITER + enclosing);
+        }
+        const nested = tryCandidates(nestedCandidates);
+        if (nested) {
+            return nested;
+        }
+        // 2. Method-local classes (composed with '.' as the method separator).
+        if (ctxMethod) {
+            const methodLocalCandidates = [];
+            for (const enclosing of enclosingChain) {
+                methodLocalCandidates.push(shortName + Const_1.NAME_DELIMITER + enclosing + '.' + ctxMethod.getName());
+            }
+            const local = tryCandidates(methodLocalCandidates);
+            if (local) {
+                return local;
+            }
+        }
+        return null;
+    }
     static findSymbolInFileWithName(symbolName, arkClass, onlyType = false) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // find symbol from enum value
@@ -516,6 +591,12 @@ class CxxModelUtils {
                 return new Local_1.Local(symbolName, (_a = TypeInference_1.TypeInference.getEnumValueType(field)) !== null && _a !== void 0 ? _a : field.getType());
             }
         }
+        // Nested classes are visible by their bare name inside the enclosing class scope;
+        // resolve them first (inner scope shadows outer) before the container-level search.
+        const nestedByShortName = this.findClassByShortName(symbolName, arkClass);
+        if (nestedByShortName) {
+            return nestedByShortName;
+        }
         // look up symbol from inner to outer
         let currNamespace = arkClass.getDeclaringArkNamespace();
         let result;

package/lib/frontend/cppFrontend/common/TypeInference.d.ts.map

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

package/lib/frontend/cppFrontend/common/TypeInference.js

@@ -65,7 +65,9 @@ const Builtin_2 = require("./Builtin");
 const ModelUtils_2 = require("./ModelUtils");
 const ArkFile_1 = require("../../../core/model/ArkFile");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'TypeInference');
-const unknownFileName = [Const_1.UNKNOWN_FILE_NAME, Builtin_1.Builtin.DUMMY_FILE_NAME];
+// Builtin stub signatures carry FileSignature.DEFAULT whose fileName is UNKNOWN_FILE_NAME,
+// so a single entry covers both unresolved references and builtin stubs.
+const unknownFileName = [Const_1.UNKNOWN_FILE_NAME];
 class TypeInference {
     static inferTypeInArkField(arkField) {
         var _a, _b;
@@ -96,11 +98,12 @@ class TypeInference {
         }
         if (fieldType) {
             arkField.getSignature().setType(fieldType);
-            fieldRef === null || fieldRef === void 0 ? void 0 : fieldRef.setFieldSignature(arkField.getSignature());
+            // A2 快路径：定义点 canonical 回写（ID 直读，graduateToFormal）。
+            fieldRef === null || fieldRef === void 0 ? void 0 : fieldRef.graduateToFormal(arkField.getFieldSigID());
         }
         else if (rightType && this.isUnclearType(beforeType) && !this.isUnclearType(rightType)) {
             arkField.getSignature().setType(rightType);
-            fieldRef === null || fieldRef === void 0 ? void 0 : fieldRef.setFieldSignature(arkField.getSignature());
+            fieldRef === null || fieldRef === void 0 ? void 0 : fieldRef.graduateToFormal(arkField.getFieldSigID());
         }
     }
     /**
@@ -177,7 +180,10 @@ class TypeInference {
             }
         }
         else if (leftOpType instanceof Type_1.AliasType) {
-            const defArkClass = (_a = declaringArkClass.getDeclaringArkFile().getScene().getMethod(leftOpType.getSignature().getDeclaringMethodSignature())) === null || _a === void 0 ? void 0 : _a.getDeclaringArkClass();
+            const defArkClass = (_a = declaringArkClass
+                .getDeclaringArkFile()
+                .getScene()
+                .getMethod(leftOpType.getSignature().getDeclaringMethodSignature())) === null || _a === void 0 ? void 0 : _a.getDeclaringArkClass();
             let baseType = this.inferUnclearedType(leftOpType.getOriginalType(), defArkClass !== null && defArkClass !== void 0 ? defArkClass : declaringArkClass, visited);
             if (baseType) {
                 leftOpType.setOriginalType(baseType);
@@ -191,7 +197,7 @@ class TypeInference {
      * @param arkMethod Ark method object for type inference
      */
     static inferTypeInMethod(arkMethod) {
-        var _a, _b;
+        var _a;
         const arkClass = arkMethod.getDeclaringArkClass();
         this.inferGenericType(arkMethod.getGenericTypes(), arkClass);
         const signatures = [];
@@ -212,15 +218,24 @@ class TypeInference {
             signatures.forEach(s => this.inferSignatureReturnType(s, arkMethod));
             return;
         }
-        (_b = body.getUsedGlobals()) === null || _b === void 0 ? void 0 : _b.forEach((value, key) => {
-            if (value instanceof Ref_1.GlobalRef && !value.getRef()) {
+        const usedGlobals = body.getUsedGlobals();
+        if (usedGlobals !== undefined) {
+            for (const key of usedGlobals.keys()) {
+                const value = usedGlobals.get(key);
+                if (!(value instanceof Ref_1.GlobalRef) || value.getRef()) {
+                    continue;
+                }
                 const arkExport = ModelUtils_1.ModelUtils.findGlobalRef(key, arkMethod);
-                if (arkExport instanceof Local_1.Local) {
-                    arkExport.getUsedStmts().push(...value.getUsedStmts());
-                    value.setRef(arkExport);
+                if (!(arkExport instanceof Local_1.Local)) {
+                    continue;
                 }
+                const usedStmts = value.getUsedStmts();
+                for (let i = 0; i < usedStmts.length; i++) {
+                    arkExport.addUsedStmt(usedStmts[i]);
+                }
+                value.setRef(arkExport);
             }
-        });
+        }
         const cfg = body.getCfg();
         for (const block of cfg.getBlocks()) {
             for (const stmt of block.getStmts()) {
@@ -517,7 +532,8 @@ class TypeInference {
                 leftType = rightType;
             }
         }
-        else if (baseType instanceof Type_1.FunctionType && !this.isUnclearType(rightType) &&
+        else if (baseType instanceof Type_1.FunctionType &&
+            !this.isUnclearType(rightType) &&
             baseType.getMethodSignature().getMethodSubSignature().getMethodName().startsWith(Const_1.ANONYMOUS_METHOD_PREFIX)) {
             leftType = rightType;
         }
@@ -546,40 +562,10 @@ class TypeInference {
      * @returns true if the type is unclear, otherwise false
      */
     static isUnclearType(type) {
-        var _a;
-        // TODO: For UnionType, IntersectionType and TupleType, it should recurse check every item of them.
-        if (!type ||
-            type instanceof Type_1.UnknownType ||
-            type instanceof Type_1.UnclearReferenceType ||
-            type instanceof Type_1.NullType ||
-            type instanceof Type_1.UndefinedType ||
-            type instanceof Type_1.GenericType) {
-            return true;
-        }
-        else if (type instanceof Type_1.ClassType &&
-            (type.getClassSignature().getDeclaringFileSignature().getFileName() === Const_1.UNKNOWN_FILE_NAME ||
-                (type.getClassSignature().getClassName() === TSConst_1.PROMISE && !type.getRealGenericTypes()) ||
-                (type.getClassSignature().getDeclaringFileSignature().getFileName() === Builtin_1.Builtin.DUMMY_FILE_NAME &&
-                    ((_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.find(t => t instanceof Type_1.GenericType))))) {
-            return true;
-        }
-        else if (type instanceof Type_1.UnionType || type instanceof Type_1.IntersectionType || type instanceof Type_1.TupleType) {
-            return !!type.getTypes().find(t => this.checkType(t, e => e instanceof Type_1.UnclearReferenceType || e instanceof Type_1.GenericType));
-        }
-        else if (type instanceof Type_1.ArrayType) {
-            const baseType = type.getBaseType();
-            return this.checkType(baseType, t => t instanceof Type_1.UnclearReferenceType || baseType instanceof Type_1.GenericType);
-        }
-        else if (type instanceof Type_1.AliasType) {
-            return this.isUnclearType(type.getOriginalType());
-        }
-        else if (type instanceof TypeExpr_1.KeyofTypeExpr) {
-            return this.isUnclearType(type.getOpType());
-        }
-        else if (type instanceof TypeExpr_1.TypeQueryExpr) {
-            return this.isUnclearType(type.getType());
-        }
-        return false;
+        // Thin delegate to the polymorphic Type.isUnclear() — the cpp-specific instanceof chain (including the PointerType/ReferenceType recursion,
+        // now owned by those classes) has converged with the core semantics. The unified implementation checks TypeQueryExpr.generateTypes
+        // (intentional convergence with core semantics).
+        return type === null || type === undefined ? true : type.isUnclear();
     }
     /**
      * This is the temporal function to check Type recursively and can be removed after typeInfer supports multiple candidate types.
@@ -870,7 +856,7 @@ class TypeInference {
             const types = Array.from(typeMap.values());
             let returnType = types.length === 1 ? types[0] : new Type_1.UnionType(types);
             if (arkMethod.containsModifier(ArkBaseModel_1.ModifierType.ASYNC)) {
-                const promise = arkMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.PROMISE);
+                const promise = SdkUtils_1.SdkUtils.getSdkGlobal(TSConst_1.PROMISE);
                 if (promise instanceof ArkClass_1.ArkClass) {
                     returnType = new Type_1.ClassType(promise.getSignature(), [returnType]);
                 }
@@ -990,7 +976,8 @@ class TypeInference {
         }
         if (typeWithoutPtrOrRef instanceof Type_1.ClassType) {
             if (fieldName === Builtin_1.Builtin.ITERATOR_RESULT_VALUE &&
-                typeWithoutPtrOrRef.getClassSignature().getDeclaringFileSignature().getProjectName() === Builtin_1.Builtin.DUMMY_PROJECT_NAME) {
+                typeWithoutPtrOrRef.getClassSigID() === -1 &&
+                typeWithoutPtrOrRef.getClassSignature().getClassName() === Builtin_2.BuiltinCxx.ITERATOR_RESULT) {
                 const types = typeWithoutPtrOrRef.getRealGenericTypes();
                 if (types && types.length > 0) {
                     return [null, types[0]];
@@ -1072,7 +1059,7 @@ class TypeInference {
         return enumValueType;
     }
     static inferArrayFieldType(declareClass, fieldName) {
-        const arrayClass = declareClass.getDeclaringArkFile().getScene().getSdkGlobal(Builtin_1.Builtin.ARRAY);
+        const arrayClass = SdkUtils_1.SdkUtils.getSdkGlobal(Builtin_1.Builtin.ARRAY);
         if (arrayClass instanceof ArkClass_1.ArkClass) {
             const property = ModelUtils_2.CxxModelUtils.findPropertyInClass(fieldName, arrayClass);
             if (property instanceof ArkField_1.ArkField) {
@@ -1098,7 +1085,7 @@ class TypeInference {
         }
         let arkExport = (_b = ModelUtils_2.CxxModelUtils.findSymbolInFileWithName(baseName, arkClass)) !== null && _b !== void 0 ? _b : ModelUtils_2.CxxModelUtils.getArkExportInImportInfoWithName(baseName, arkClass.getDeclaringArkFile(), arkClass);
         if (!arkExport && !arkClass.getDeclaringArkFile().getImportInfoBy(baseName)) {
-            arkExport = arkClass.getDeclaringArkFile().getScene().getSdkGlobal(baseName);
+            arkExport = SdkUtils_1.SdkUtils.getSdkGlobal(baseName);
         }
         return this.parseArkExport2Type(arkExport);
     }
@@ -1116,7 +1103,7 @@ class TypeInference {
         //if not found or local in built-in then look up global in sdks
         if ((!arkExport || (arkExport instanceof Local_1.Local && declaredArkFile.getProjectName() === SdkUtils_1.SdkUtils.BUILT_IN_NAME)) &&
             !declaredArkFile.getImportInfoBy(typeName)) {
-            const globalVal = arkClass.getDeclaringArkFile().getScene().getSdkGlobal(typeName);
+            const globalVal = SdkUtils_1.SdkUtils.getSdkGlobal(typeName);
             if (globalVal) {
                 arkExport = globalVal;
             }
@@ -1332,14 +1319,17 @@ class TypeInference {
         return null;
     }
     static inferNestedClassType(declareClass, baseType, fieldName) {
-        var _a;
         const arkClass = declareClass.getDeclaringArkFile().getScene().getClass(baseType.getClassSignature());
         if (!arkClass) {
             return null;
         }
-        const declScope = (_a = arkClass.getDeclaringArkNamespace()) !== null && _a !== void 0 ? _a : arkClass.getDeclaringArkFile();
+        // 嵌套类以完整存储名 'field$Outer' 挂在 baseType 类的声明作用域顶层，
+        // 拼归属签名直查（查询名含 $，原前缀模糊匹配本就不可命中，精确等价）
         const nestedClassName = fieldName + Const_1.NAME_DELIMITER + baseType.getClassSignature().getClassName();
-        const nestedClass = declScope.getClassWithName(nestedClassName);
+        const declNamespace = arkClass.getDeclaringArkNamespace();
+        const nestedClass = declNamespace
+            ? declNamespace.getClass(new ArkSignature_1.ClassSignature(nestedClassName, declNamespace.getDeclaringFileID(), declNamespace.getNamespaceSigID()))
+            : arkClass.getDeclaringArkFile().getClass(new ArkSignature_1.ClassSignature(nestedClassName, arkClass.getDeclaringArkFile().getFileSigID()));
         if (!nestedClass) {
             return null;
         }

package/lib/frontend/cppFrontend/graph/builder/CfgBuilder.d.ts.map

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

package/lib/frontend/cppFrontend/graph/builder/CfgBuilder.js

@@ -16,6 +16,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CfgBuilder = exports.TryStatementBuilder = exports.SwitchStatementBuilder = exports.StatementBuilder = exports.Case = exports.BlockBuilder = void 0;
 const Local_1 = require("../../../../core/base/Local");
+const SdkUtils_1 = require("../../../../core/common/SdkUtils");
 const Stmt_1 = require("../../../../core/base/Stmt");
 const BasicBlock_1 = require("../../../../core/graph/BasicBlock");
 const Cfg_1 = require("../../../../core/graph/Cfg");
@@ -1406,7 +1407,7 @@ class CfgBuilder {
         }
         if (this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType && !this.declaringMethod.getAsteriskToken()) {
             if (this.declaringMethod.containsModifier(ArkBaseModel_1.ModifierType.ASYNC)) {
-                const promise = this.declaringMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.PROMISE);
+                const promise = SdkUtils_1.SdkUtils.getSdkGlobal(TSConst_1.PROMISE);
                 if (promise instanceof ArkClass_1.ArkClass) {
                     this.declaringMethod.getSubSignature().setReturnType(new Type_1.ClassType(promise.getSignature()));
                 }

package/lib/frontend/cppFrontend/inference/CxxModelInference.d.ts

@@ -23,6 +23,6 @@ export declare class CxxMethodInference extends MethodInference {
 }
 export declare class CxxStmtInference extends StmtInference {
     constructor(valueInferences: ValueInference<Value>[]);
-    typeSpread(stmt: Stmt, method: ArkMethod): Set<Stmt>;
+    typeSpread(stmt: Stmt, method: ArkMethod): Stmt[] | undefined;
 }
 //# sourceMappingURL=CxxModelInference.d.ts.map

package/lib/frontend/cppFrontend/inference/CxxModelInference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CxxModelInference.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/inference/CxxModelInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5I,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAA0B,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEvE,qBAAa,gBAAiB,SAAQ,aAAa;IAC/C,OAAO,CAAC,uBAAuB,CAAc;IAEtC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;CASvC;AAED,qBAAa,kBAAmB,SAAQ,mBAAmB;IAChD,QAAQ,CAAC,QAAQ,EAAE,UAAU,GAAG,IAAI;IAIpC,KAAK,CAAC,QAAQ,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;CAGxD;AAED,qBAAa,iBAAkB,SAAQ,cAAc;IAC1C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAY5C;AAED,qBAAa,kBAAmB,SAAQ,eAAe;IAC5C,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAiB9C;AAED,qBAAa,gBAAiB,SAAQ,aAAa;gBACnC,eAAe,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;IAI7C,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC;CAS9D"}
+{"version":3,"file":"CxxModelInference.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/inference/CxxModelInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5I,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAA0B,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEvE,qBAAa,gBAAiB,SAAQ,aAAa;IAC/C,OAAO,CAAC,uBAAuB,CAAc;IAEtC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;CASvC;AAED,qBAAa,kBAAmB,SAAQ,mBAAmB;IAChD,QAAQ,CAAC,QAAQ,EAAE,UAAU,GAAG,IAAI;IAIpC,KAAK,CAAC,QAAQ,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;CAGxD;AAED,qBAAa,iBAAkB,SAAQ,cAAc;IAC1C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAY5C;AAED,qBAAa,kBAAmB,SAAQ,eAAe;IAC5C,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAiB9C;AAED,qBAAa,gBAAiB,SAAQ,aAAa;gBACnC,eAAe,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;IAI7C,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,SAAS;CASvE"}

package/lib/frontend/cppFrontend/inference/CxxValueInference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CxxValueInference.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/inference/CxxValueInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAuB,UAAU,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAqB,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAWxH,qBAAa,oBAAqB,SAAQ,iBAAiB;IAChD,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAY1E;AAED,qBAAa,8BAA+B,SAAQ,2BAA2B;IACpE,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO;IAO5D,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAwB5E;AAED,qBAAa,sBAAuB,SAAQ,cAAc,CAAC,UAAU,CAAC;IAC3D,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IAIpC,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CA4BjE;AAED,wBAAgB,qBAAqB,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAM/D"}
+{"version":3,"file":"CxxValueInference.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/inference/CxxValueInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAuB,UAAU,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAqB,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAaxH,qBAAa,oBAAqB,SAAQ,iBAAiB;IAChD,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CA4C1E;AAED,qBAAa,8BAA+B,SAAQ,2BAA2B;IACpE,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO;IAO5D,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAwB5E;AAED,qBAAa,sBAAuB,SAAQ,cAAc,CAAC,UAAU,CAAC;IAC3D,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IAIpC,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CA4BjE;AAED,wBAAgB,qBAAqB,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAM/D"}

package/lib/frontend/cppFrontend/inference/CxxValueInference.js

@@ -24,6 +24,8 @@ const IRInference_1 = require("../../../core/common/IRInference");
 const ModelUtils_1 = require("../../../core/common/ModelUtils");
 const TypeInference_1 = require("../../../core/common/TypeInference");
 const Local_1 = require("../../../core/base/Local");
+const ArkSignature_1 = require("../../../core/model/ArkSignature");
+const SignatureCanonicalizerRegistry_1 = require("../../../core/common/SignatureCanonicalizerRegistry");
 const TypeInference_2 = require("../common/TypeInference");
 const IRInference_2 = require("../common/IRInference");
 const ModelUtils_2 = require("../common/ModelUtils");
@@ -33,13 +35,47 @@ class CxxFieldRefInference extends ValueInference_1.FieldRefInference {
         return 'ArkCxxInstanceFieldRef';
     }
     infer(value, stmt) {
+        var _a;
         const baseType = TypeInference_2.TypeInference.replaceAliasType(value.getBase().getType());
         const arkMethod = stmt.getCfg().getDeclaringMethod();
-        const newFieldSignature = IRInference_2.IRInference.generateNewFieldSignature(value, arkMethod.getDeclaringArkClass(), baseType);
-        if (newFieldSignature) {
-            value.setFieldSignature(newFieldSignature);
-            if (newFieldSignature.isStatic()) {
-                return new Ref_1.ArkStaticFieldRef(newFieldSignature);
+        // 判别联合消费——保持原语义顺序（先更新 value 再判 static）。
+        const resolution = IRInference_2.IRInference.generateNewFieldSignature(value, arkMethod.getDeclaringArkClass(), baseType);
+        if (resolution === null) {
+            return undefined;
+        }
+        if (resolution.kind === 'formal') {
+            const formalId = (_a = resolution.formalId) !== null && _a !== void 0 ? _a : 0;
+            if (formalId > 0) {
+                value.graduateToFormal(formalId);
+                if (resolution.staticFlag) {
+                    // 替换埋葬：graduateToFormal 已 retire（formal 分支本就正确）——此处返回的 static ref 产物为 canonical。
+                    const canonical = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().fieldSigCanonicalizer.get(formalId);
+                    return new Ref_1.ArkStaticFieldRef(canonical);
+                }
+            }
+            return undefined;
+        }
+        const params = resolution;
+        value.updateFieldSignature(params.fieldName, params.declaringOrID, params.type, params.staticFlag, params.namespaceDeclared);
+        if (params.staticFlag) {
+            let staticSig;
+            if (typeof params.declaringOrID === 'number') {
+                staticSig = params.namespaceDeclared
+                    ? new ArkSignature_1.FieldSignature(params.fieldName, params.declaringOrID, params.type, params.staticFlag, true)
+                    : new ArkSignature_1.FieldSignature(params.fieldName, params.declaringOrID, params.type, params.staticFlag);
+            }
+            else {
+                staticSig = new ArkSignature_1.FieldSignature(params.fieldName, params.declaringOrID, params.type, params.staticFlag);
+            }
+            // probe：miss 时 params 携带值空间成员（ns 导出的 class/enum 等，字段
+            // 空间无 formal 归宿）——转换会走 clear+miss error 路由并多占一个
+            // slot；miss 保持 update 就地演进后的 value（不 retire、不转换）。
+            if (SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().fieldSigCanonicalizer.getExistingId(staticSig) !== -1) {
+                // 替换埋葬：static params 形态——value 的 temp 行已被 update
+                // （就地演进保持），但 value 即将被返回的 static ref 替换（IR 层
+                // 替换）——纯 retire（params 值非 formal，无归宿记录）。
+                value.retireTemp();
+                return new Ref_1.ArkStaticFieldRef(staticSig);
             }
         }
         return undefined;

package/lib/frontend/cppFrontend/model/builder/ArkClassBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAwC,MAAM,iCAAiC,CAAC;AAUjG,OAAO,EACH,UAAU,EAOb,MAAM,2BAA2B,CAAC;AAenC,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAOnJ;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACpD,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAK7G;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GACjC,IAAI,CAMN;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAwBtI;AA+PD,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAInH"}
+{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAwC,MAAM,iCAAiC,CAAC;AAUjG,OAAO,EAAE,UAAU,EAAgF,MAAM,2BAA2B,CAAC;AAerI,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAOnJ;AAED,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GACjC,IAAI,CAIN;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GACjC,IAAI,CAIN;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAwBtI;AAkPD,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAGnH"}