arkanalyzer 1.0.93 → 2.0.0-beta1

package/lib/frontend/cppFrontend/common/Builtin.d.ts

@@ -1,5 +1,11 @@
-import { ClassSignature, FileSignature } from '../../../core/model/ArkSignature';
+import { ClassSignature } from '../../../core/model/ArkSignature';
 import { ClassType } from '../../../core/base/Type';
+/**
+ * C++ built-in container names, syntax constants, and signature stubs.
+ *
+ * Signatures created here are **unclear stubs** (declaring file = FileSignature.DEFAULT) that
+ * live in the temp canonicalizer and are resolved to real signatures during type inference.
+ */
 export declare class BuiltinCxx {
     static ARRAY: string;
     static SET: string;
@@ -26,17 +32,6 @@ export declare class BuiltinCxx {
     static OPERATOR_ISTREAM: string;
     static OPERATOR_OSTREAM: string;
     static BUILT_IN_CLASSES: Set<string>;
-    static DUMMY_PROJECT_NAME: string;
-    static DUMMY_FILE_NAME: string;
-    static BUILT_IN_CLASSES_FILE_SIGNATURE: FileSignature;
-    static OBJECT_CLASS_SIGNATURE: ClassSignature;
-    static OBJECT_CLASS_TYPE: ClassType;
-    static ARRAY_CLASS_SIGNATURE: ClassSignature;
-    static SET_CLASS_SIGNATURE: ClassSignature;
-    static MAP_CLASS_SIGNATURE: ClassSignature;
-    static REGEXP_CLASS_SIGNATURE: ClassSignature;
-    static REGEXP_CLASS_TYPE: ClassType;
-    static BUILT_IN_CLASS_SIGNATURE_MAP: Map<string, ClassSignature>;
     static ITERATOR_FUNCTION: string;
     static ITERATOR: string;
     static ITERATOR_NEXT: string;
@@ -44,14 +39,29 @@ export declare class BuiltinCxx {
     static ITERATOR_RESULT_BEGIN: string;
     static ITERATOR_RESULT_END: string;
     static ITERATOR_VALUE: string;
-    static ITERATOR_CLASS_SIGNATURE: ClassSignature;
-    static ITERATOR_RESULT_CLASS_SIGNATURE: ClassSignature;
-    static ITERATOR_CLASS_TYPE: ClassType;
-    static ITERATOR_RESULT_CLASS_TYPE: ClassType;
+    /**
+     * Unclear stub signature for a built-in class name (shared instance per name).
+     * Delegates to the core Builtin cache so that core and C++ consumers of the same
+     * name (e.g. 'Object') share one stub instance — and thus one temp SigID.
+     */
+    static getBuiltinClassSignature(className: string): ClassSignature;
+    static get OBJECT_CLASS_SIGNATURE(): ClassSignature;
+    static get OBJECT_CLASS_TYPE(): ClassType;
+    static get ARRAY_CLASS_SIGNATURE(): ClassSignature;
+    static get SET_CLASS_SIGNATURE(): ClassSignature;
+    static get MAP_CLASS_SIGNATURE(): ClassSignature;
+    static get REGEXP_CLASS_SIGNATURE(): ClassSignature;
+    static get REGEXP_CLASS_TYPE(): ClassType;
+    static get ITERATOR_CLASS_SIGNATURE(): ClassSignature;
+    static get ITERATOR_RESULT_CLASS_SIGNATURE(): ClassSignature;
+    static get ITERATOR_CLASS_TYPE(): ClassType;
+    static get ITERATOR_RESULT_CLASS_TYPE(): ClassType;
     private static buildBuiltInClasses;
-    private static buildBuiltInClassesFileSignature;
-    static buildBuiltInClassSignature(className: string): ClassSignature;
+    /**
+     * Whether the signature is an unresolved (stub) built-in container class.
+     * The old projectName check is replaced by the unclear check: stubs are unclear,
+     * while real parsed / resolved classes have concrete declaring files.
+     */
     static isBuiltinClass(classSignature: ClassSignature): boolean;
-    private static buildBuiltInClassSignatureMap;
 }
 //# sourceMappingURL=Builtin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Builtin.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/Builtin.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,SAAS,EAAe,MAAM,yBAAyB,CAAC;AAEjE,qBAAa,UAAU;IAEnB,OAAc,KAAK,SAAW;IAC9B,OAAc,GAAG,SAAS;IAC1B,OAAc,GAAG,SAAS;IAC1B,OAAc,aAAa,SAAmB;IAC9C,OAAc,KAAK,SAAW;IAC9B,OAAc,KAAK,SAAW;IAC9B,OAAc,KAAK,SAAW;IAC9B,OAAc,IAAI,SAAU;IAC5B,OAAc,MAAM,SAAY;IAChC,OAAc,aAAa,SAAmB;IAC9C,OAAc,cAAc,SAAoB;IAChD,OAAc,YAAY,SAAkB;IAC5C,OAAc,QAAQ,SAAc;IACpC,OAAc,QAAQ,SAAc;IACpC,OAAc,kBAAkB,SAAwB;IACxD,OAAc,kBAAkB,SAAwB;IACxD,OAAc,MAAM,SAAY;IAChC,OAAc,MAAM,SAAY;IAChC,OAAc,MAAM,SAAS;IAC7B,OAAc,SAAS,SAAW;IAClC,OAAc,gBAAgB,SAAe;IAC7C,OAAc,uBAAuB,SAA6B;IAClE,OAAc,gBAAgB,SAAgB;IAC9C,OAAc,gBAAgB,SAAgB;IAE9C,OAAc,gBAAgB,cAA8B;IAE5D,OAAc,kBAAkB,SAAa;IAC7C,OAAc,eAAe,SAAkB;IAE/C,OAAc,+BAA+B,gBAAiD;IAC9F,OAAc,sBAAsB,iBAAgD;IACpF,OAAc,iBAAiB,YAA8C;IAC7E,OAAc,qBAAqB,iBAA+C;IAClF,OAAc,mBAAmB,iBAA6C;IAC9E,OAAc,mBAAmB,iBAA6C;IAC9E,OAAc,sBAAsB,iBAAgD;IACpF,OAAc,iBAAiB,YAA8C;IAC7E,OAAc,4BAA4B,8BAAwC;IAKlF,OAAc,iBAAiB,SAAc;IAC7C,OAAc,QAAQ,SAAsB;IAC5C,OAAc,aAAa,SAAgB;IAC3C,OAAc,eAAe,SAAe;IAC5C,OAAc,qBAAqB,SAAW;IAC9C,OAAc,mBAAmB,SAAS;IAC1C,OAAc,cAAc,SAAO;IAEnC,OAAc,wBAAwB,iBAAkD;IACxF,OAAc,+BAA+B,iBAAyD;IACtG,OAAc,mBAAmB,YAAwE;IACzG,OAAc,0BAA0B,YAA+E;IACvH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAclC,OAAO,CAAC,MAAM,CAAC,gCAAgC;WAIjC,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;WAG7D,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO;IAMrE,OAAO,CAAC,MAAM,CAAC,6BAA6B;CAS/C"}
+{"version":3,"file":"Builtin.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/Builtin.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAe,MAAM,yBAAyB,CAAC;AAGjE;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,OAAc,KAAK,SAAW;IAC9B,OAAc,GAAG,SAAS;IAC1B,OAAc,GAAG,SAAS;IAC1B,OAAc,aAAa,SAAmB;IAC9C,OAAc,KAAK,SAAW;IAC9B,OAAc,KAAK,SAAW;IAC9B,OAAc,KAAK,SAAW;IAC9B,OAAc,IAAI,SAAU;IAC5B,OAAc,MAAM,SAAY;IAChC,OAAc,aAAa,SAAmB;IAC9C,OAAc,cAAc,SAAoB;IAChD,OAAc,YAAY,SAAkB;IAC5C,OAAc,QAAQ,SAAc;IACpC,OAAc,QAAQ,SAAc;IACpC,OAAc,kBAAkB,SAAwB;IACxD,OAAc,kBAAkB,SAAwB;IACxD,OAAc,MAAM,SAAY;IAChC,OAAc,MAAM,SAAY;IAChC,OAAc,MAAM,SAAS;IAC7B,OAAc,SAAS,SAAW;IAClC,OAAc,gBAAgB,SAAe;IAC7C,OAAc,uBAAuB,SAA6B;IAClE,OAAc,gBAAgB,SAAgB;IAC9C,OAAc,gBAAgB,SAAgB;IAE9C,OAAc,gBAAgB,cAA8B;IAG5D,OAAc,iBAAiB,SAAc;IAC7C,OAAc,QAAQ,SAAsB;IAC5C,OAAc,aAAa,SAAgB;IAC3C,OAAc,eAAe,SAAe;IAC5C,OAAc,qBAAqB,SAAW;IAC9C,OAAc,mBAAmB,SAAS;IAC1C,OAAc,cAAc,SAAO;IAInC;;;;OAIG;WACW,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;IAIzE,WAAkB,sBAAsB,IAAI,cAAc,CAEzD;IACD,WAAkB,iBAAiB,IAAI,SAAS,CAE/C;IACD,WAAkB,qBAAqB,IAAI,cAAc,CAExD;IACD,WAAkB,mBAAmB,IAAI,cAAc,CAEtD;IACD,WAAkB,mBAAmB,IAAI,cAAc,CAEtD;IACD,WAAkB,sBAAsB,IAAI,cAAc,CAEzD;IACD,WAAkB,iBAAiB,IAAI,SAAS,CAE/C;IAED,WAAkB,wBAAwB,IAAI,cAAc,CAE3D;IACD,WAAkB,+BAA+B,IAAI,cAAc,CAElE;IACD,WAAkB,mBAAmB,IAAI,SAAS,CAEjD;IACD,WAAkB,0BAA0B,IAAI,SAAS,CAExD;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAclC;;;;OAIG;WACW,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO;CAGxE"}

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

@@ -16,9 +16,57 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuiltinCxx = void 0;
-const ArkSignature_1 = require("../../../core/model/ArkSignature");
 const Type_1 = require("../../../core/base/Type");
+const Builtin_1 = require("../../../core/common/Builtin");
+/**
+ * C++ built-in container names, syntax constants, and signature stubs.
+ *
+ * Signatures created here are **unclear stubs** (declaring file = FileSignature.DEFAULT) that
+ * live in the temp canonicalizer and are resolved to real signatures during type inference.
+ */
 class BuiltinCxx {
+    // --- Stable unclear stubs (shared per name, delegate to core Builtin's cache) ---
+    /**
+     * Unclear stub signature for a built-in class name (shared instance per name).
+     * Delegates to the core Builtin cache so that core and C++ consumers of the same
+     * name (e.g. 'Object') share one stub instance — and thus one temp SigID.
+     */
+    static getBuiltinClassSignature(className) {
+        return Builtin_1.Builtin.getBuiltinClassSignature(className);
+    }
+    static get OBJECT_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.OBJECT);
+    }
+    static get OBJECT_CLASS_TYPE() {
+        return new Type_1.ClassType(this.OBJECT_CLASS_SIGNATURE);
+    }
+    static get ARRAY_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.ARRAY);
+    }
+    static get SET_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.SET);
+    }
+    static get MAP_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.MAP);
+    }
+    static get REGEXP_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.REGEXP);
+    }
+    static get REGEXP_CLASS_TYPE() {
+        return new Type_1.ClassType(this.REGEXP_CLASS_SIGNATURE);
+    }
+    static get ITERATOR_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.ITERATOR);
+    }
+    static get ITERATOR_RESULT_CLASS_SIGNATURE() {
+        return this.getBuiltinClassSignature(this.ITERATOR_RESULT);
+    }
+    static get ITERATOR_CLASS_TYPE() {
+        return new Type_1.ClassType(this.ITERATOR_CLASS_SIGNATURE, [new Type_1.GenericType('T')]);
+    }
+    static get ITERATOR_RESULT_CLASS_TYPE() {
+        return new Type_1.ClassType(this.ITERATOR_RESULT_CLASS_SIGNATURE, [new Type_1.GenericType('T')]);
+    }
     static buildBuiltInClasses() {
         const builtInClasses = new Set();
         builtInClasses.add(this.ARRAY);
@@ -32,25 +80,13 @@ class BuiltinCxx {
         builtInClasses.add(this.VECTOR);
         return builtInClasses;
     }
-    static buildBuiltInClassesFileSignature() {
-        return new ArkSignature_1.FileSignature(this.DUMMY_PROJECT_NAME, this.DUMMY_FILE_NAME);
-    }
-    static buildBuiltInClassSignature(className) {
-        return new ArkSignature_1.ClassSignature(className, this.BUILT_IN_CLASSES_FILE_SIGNATURE);
-    }
+    /**
+     * Whether the signature is an unresolved (stub) built-in container class.
+     * The old projectName check is replaced by the unclear check: stubs are unclear,
+     * while real parsed / resolved classes have concrete declaring files.
+     */
     static isBuiltinClass(classSignature) {
-        const className = classSignature.getClassName();
-        const projectName = classSignature.getDeclaringFileSignature().getProjectName();
-        return this.BUILT_IN_CLASSES.has(className) && projectName === this.DUMMY_PROJECT_NAME;
-    }
-    static buildBuiltInClassSignatureMap() {
-        const builtInClassSignatureMap = new Map();
-        builtInClassSignatureMap.set(this.OBJECT, this.OBJECT_CLASS_SIGNATURE);
-        builtInClassSignatureMap.set(this.ARRAY, this.ARRAY_CLASS_SIGNATURE);
-        builtInClassSignatureMap.set(this.SET, this.SET_CLASS_SIGNATURE);
-        builtInClassSignatureMap.set(this.MAP, this.MAP_CLASS_SIGNATURE);
-        builtInClassSignatureMap.set(this.REGEXP, this.REGEXP_CLASS_SIGNATURE);
-        return builtInClassSignatureMap;
+        return this.BUILT_IN_CLASSES.has(classSignature.getClassName()) && classSignature.isUnclear();
     }
 }
 exports.BuiltinCxx = BuiltinCxx;
@@ -81,18 +117,7 @@ BuiltinCxx.ANONYMOUS_NAMESPACE_REF = '(anonymous namespace)::';
 BuiltinCxx.OPERATOR_ISTREAM = 'operator>>';
 BuiltinCxx.OPERATOR_OSTREAM = 'operator<<';
 BuiltinCxx.BUILT_IN_CLASSES = _a.buildBuiltInClasses();
-BuiltinCxx.DUMMY_PROJECT_NAME = 'CXX/std';
-BuiltinCxx.DUMMY_FILE_NAME = 'BuiltinClass';
-BuiltinCxx.BUILT_IN_CLASSES_FILE_SIGNATURE = BuiltinCxx.buildBuiltInClassesFileSignature();
-BuiltinCxx.OBJECT_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.OBJECT);
-BuiltinCxx.OBJECT_CLASS_TYPE = new Type_1.ClassType(_a.OBJECT_CLASS_SIGNATURE);
-BuiltinCxx.ARRAY_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.ARRAY);
-BuiltinCxx.SET_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.SET);
-BuiltinCxx.MAP_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.MAP);
-BuiltinCxx.REGEXP_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.REGEXP);
-BuiltinCxx.REGEXP_CLASS_TYPE = new Type_1.ClassType(_a.REGEXP_CLASS_SIGNATURE);
-BuiltinCxx.BUILT_IN_CLASS_SIGNATURE_MAP = _a.buildBuiltInClassSignatureMap();
-// signature for built-in class
+// iterator constants (C++ range-for lowering)
 BuiltinCxx.ITERATOR_FUNCTION = 'iterator';
 BuiltinCxx.ITERATOR = 'IterableIterator';
 BuiltinCxx.ITERATOR_NEXT = 'iterator++';
@@ -100,7 +125,3 @@ BuiltinCxx.ITERATOR_RESULT = 'operator*';
 BuiltinCxx.ITERATOR_RESULT_BEGIN = 'begin';
 BuiltinCxx.ITERATOR_RESULT_END = 'end';
 BuiltinCxx.ITERATOR_VALUE = '*';
-BuiltinCxx.ITERATOR_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.ITERATOR);
-BuiltinCxx.ITERATOR_RESULT_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.ITERATOR_RESULT);
-BuiltinCxx.ITERATOR_CLASS_TYPE = new Type_1.ClassType(_a.ITERATOR_CLASS_SIGNATURE, [new Type_1.GenericType('T')]);
-BuiltinCxx.ITERATOR_RESULT_CLASS_TYPE = new Type_1.ClassType(_a.ITERATOR_RESULT_CLASS_SIGNATURE, [new Type_1.GenericType('T')]);

package/lib/frontend/cppFrontend/common/IRInference.d.ts

@@ -1,10 +1,11 @@
+import { FieldSigResolution } from '../../../core/common/IRInference';
 import { ArkMethod } from '../../../core/model/ArkMethod';
 import { ClassType, Type } from '../../../core/base/Type';
 import { Local } from '../../../core/base/Local';
 import { AbstractExpr, AbstractInvokeExpr, AliasTypeExpr, ArkInstanceInvokeExpr, ArkStaticInvokeExpr } from '../../../core/base/Expr';
 import { Scene } from '../../../Scene';
 import { ArkClass } from '../../../core/model/ArkClass';
-import { ClassSignature, FieldSignature, MethodSignature } from '../../../core/model/ArkSignature';
+import { ClassSignature, MethodSignature } from '../../../core/model/ArkSignature';
 import { AbstractFieldRef, AbstractRef, ArkInstanceFieldRef, ArkParameterRef } from '../../../core/base/Ref';
 import { ArkFile } from '../../../core/model/ArkFile';
 import { KeyofTypeExpr, TypeQueryExpr } from '../../../core/base/TypeExpr';
@@ -39,7 +40,11 @@ export declare class IRInference {
     static replaceMethodSignature(init: MethodSignature, declared: MethodSignature): MethodSignature;
     private static processForEach;
     static inferLocal(base: Local, arkMethod: ArkMethod): void;
-    static generateNewFieldSignature(ref: AbstractFieldRef, arkClass: ArkClass, baseType: Type): FieldSignature | null;
+    /**
+     * 判别联合——定义点 canonical（formal 分支，终点确定）与新构造值（params 分支，终点不确定）分流；null = 未解析。
+     * 泛型守卫（泛型字段不走定义点）为 cpp 侧遗留语义，照搬不改。
+     */
+    static generateNewFieldSignature(ref: AbstractFieldRef, arkClass: ArkClass, baseType: Type): FieldSigResolution;
     private static repairType;
     static inferAnonymousClass(anon: ArkClass | null, declaredSignature: ClassSignature, set?: Set<string>): void;
     private static assignAnonMethod;

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

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

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

@@ -43,6 +43,7 @@ exports.IRInference = void 0;
  */
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importStar(require("path"));
+const IRInference_1 = require("../../../core/common/IRInference");
 const cppUtils_1 = require("../utils/cppUtils");
 const ArkMethod_1 = require("../../../core/model/ArkMethod");
 const Type_1 = require("../../../core/base/Type");
@@ -118,8 +119,12 @@ class IRInference {
         this.inferExportInfos(file);
     }
     static inferStaticInvokeExpr(expr, arkMethod) {
-        const fileSignature = expr.getMethodSignature().getDeclaringClassSignature().getDeclaringFileSignature();
-        if (fileSignature !== ArkSignature_1.FileSignature.DEFAULT && fileSignature !== Builtin_1.Builtin.BUILT_IN_CLASSES_FILE_SIGNATURE) {
+        // Builtin stubs carry FileSignature.DEFAULT (FileSigID 0), so the ID > 0 check lets
+        // real files through to inference (the old reference comparison against the core
+        // ES2015 virtual signature was always true for CXX/std signatures — dead condition, now removed).
+        // Pure field read: FileSigID 0 = DEFAULT (internDefaults 固化), > 0 = real file.
+        const fileSigID = expr.getMethodSignature().getDeclaringClassSignature().getDeclaringFileSigID();
+        if (fileSigID > 0) {
             return expr;
         }
         const arkClass = arkMethod.getDeclaringArkClass();
@@ -139,7 +144,7 @@ class IRInference {
         else if (methodName === TSConst_1.SUPER_NAME) {
             const superClass = arkClass.getSuperClass();
             if (superClass !== null) {
-                const newMethodSignature = new ArkSignature_1.MethodSignature(superClass.getSignature(), expr.getMethodSignature().getMethodSubSignature());
+                const newMethodSignature = new ArkSignature_1.MethodSignature(superClass.getClassSigID(), expr.getMethodSignature().getMethodSubSignature());
                 expr.setMethodSignature(newMethodSignature);
             }
             return expr;
@@ -161,7 +166,7 @@ class IRInference {
     static inferStaticInvokeExprByMethodName(methodName, arkMethod, expr) {
         var _a, _b, _c, _d;
         const arkClass = arkMethod.getDeclaringArkClass();
-        const arkExport = (_d = (_c = (_b = (_a = ModelUtils_2.CxxModelUtils.getStaticMethodWithName(methodName, arkClass)) !== null && _a !== void 0 ? _a : arkMethod.getFunctionLocal(methodName)) !== null && _b !== void 0 ? _b : ModelUtils_1.ModelUtils.findDeclaredLocal(new Local_1.Local(methodName), arkMethod)) !== null && _c !== void 0 ? _c : ModelUtils_2.CxxModelUtils.getArkExportInImportInfoWithName(methodName, arkClass.getDeclaringArkFile(), arkClass)) !== null && _d !== void 0 ? _d : arkClass.getDeclaringArkFile().getScene().getSdkGlobal(methodName);
+        const arkExport = (_d = (_c = (_b = (_a = ModelUtils_2.CxxModelUtils.getStaticMethodWithName(methodName, arkClass)) !== null && _a !== void 0 ? _a : arkMethod.getFunctionLocal(methodName)) !== null && _b !== void 0 ? _b : ModelUtils_1.ModelUtils.findDeclaredLocal(new Local_1.Local(methodName), arkMethod)) !== null && _c !== void 0 ? _c : ModelUtils_2.CxxModelUtils.getArkExportInImportInfoWithName(methodName, arkClass.getDeclaringArkFile(), arkClass)) !== null && _d !== void 0 ? _d : SdkUtils_1.SdkUtils.getSdkGlobal(methodName);
         let { mtd: method, sig: signature } = this.processArkExportForMethodAndSignature(arkExport, arkClass);
         if (method) {
             signature = method.matchMethodSignature(expr.getArgs());
@@ -274,16 +279,13 @@ class IRInference {
         this.inferBase(ref, arkMethod);
         const baseType = TypeInference_1.TypeInference.replaceAliasType(ref.getBase().getType());
         if (baseType instanceof Type_1.ArrayType && ref.getFieldName() !== 'length') {
+            // 替换埋葬：本 ref 即将被 ArkArrayRef 替换——纯 retire。
+            ref.retireTemp();
             return new Ref_1.ArkArrayRef(ref.getBase(), ValueUtil_1.ValueUtil.createConst(ref.getFieldName()));
         }
-        let newFieldSignature = this.generateNewFieldSignature(ref, arkMethod.getDeclaringArkClass(), baseType);
-        if (newFieldSignature) {
-            if (newFieldSignature.isStatic()) {
-                return new Ref_1.ArkStaticFieldRef(newFieldSignature);
-            }
-            ref.setFieldSignature(newFieldSignature);
-        }
-        return ref;
+        // 判别联合消费——终态执行统一走 core 的 applyFieldResolution（formal：graduate/static 转换；params：static probe 转换/就地演进）。
+        const resolution = this.generateNewFieldSignature(ref, arkMethod.getDeclaringArkClass(), baseType);
+        return IRInference_1.IRInference.applyFieldResolution(ref, resolution);
     }
     static inferBase(instance, arkMethod) {
         const base = instance.getBase();
@@ -466,7 +468,7 @@ class IRInference {
         return null;
     }
     static inferInvokeExprWithArray(methodName, expr, baseType, scene) {
-        const arrayInterface = scene.getSdkGlobal(Builtin_1.Builtin.ARRAY);
+        const arrayInterface = SdkUtils_1.SdkUtils.getSdkGlobal(Builtin_1.Builtin.ARRAY);
         if (arrayInterface instanceof ArkClass_1.ArkClass) {
             return this.inferInvokeExpr(expr, new Type_1.ClassType(arrayInterface.getSignature(), [baseType.getBaseType()]), methodName, scene);
         }
@@ -482,7 +484,7 @@ class IRInference {
             expr.setMethodSignature(baseType.getMethodSignature());
             return expr;
         }
-        const funcInterface = scene.getSdkGlobal(TSConst_1.FUNCTION);
+        const funcInterface = SdkUtils_1.SdkUtils.getSdkGlobal(TSConst_1.FUNCTION);
         if (funcInterface instanceof ArkClass_1.ArkClass) {
             const method = ModelUtils_1.ModelUtils.findPropertyInClass(methodName, funcInterface);
             if (method instanceof ArkMethod_1.ArkMethod) {
@@ -497,7 +499,7 @@ class IRInference {
         var _a, _b;
         let declaredClass = scene.getClass(baseType.getClassSignature());
         if (!declaredClass) {
-            const globalClass = scene.getSdkGlobal(baseType.getClassSignature().getClassName());
+            const globalClass = SdkUtils_1.SdkUtils.getSdkGlobal(baseType.getClassSignature().getClassName());
             if (globalClass instanceof ArkClass_1.ArkClass) {
                 declaredClass = globalClass;
             }
@@ -526,12 +528,16 @@ class IRInference {
             }
             else {
                 const subSignature = new ArkSignature_1.MethodSubSignature(methodName, [], new Type_1.ClassType(baseType.getClassSignature()));
+                // getClassSignature() (not getClassSigID()): the class may still be unclear and live in
+                // the temp canonicalizer; the object overload interns it properly.
                 expr.setMethodSignature(new ArkSignature_1.MethodSignature(baseType.getClassSignature(), subSignature));
             }
             return expr;
         }
         else if (methodName === Builtin_1.Builtin.ITERATOR_NEXT &&
-            baseType.getClassSignature().getDeclaringFileSignature().getProjectName() === Builtin_1.Builtin.DUMMY_PROJECT_NAME) {
+            baseType.getClassSigID() === -1 &&
+            baseType.getClassSignature().getClassName() === Builtin_1.Builtin.ITERATOR) {
+            // Fires only on the UNRESOLVED iterator stub (old: virtual 'CXX/std' project check).
             expr.getMethodSignature().getMethodSubSignature().setReturnType(Builtin_1.Builtin.ITERATOR_RESULT_CLASS_TYPE);
             expr.setRealGenericTypes(baseType.getRealGenericTypes());
             return expr;
@@ -588,12 +594,20 @@ class IRInference {
     static replaceMethodSignature(init, declared) {
         const className = init.getDeclaringClassSignature().getClassName();
         let classSignature;
-        if (declared.getDeclaringClassSignature().getClassName().endsWith('Interface')) {
+        // display 归一化：仅当 init 类名有信息量（非 %unk——组件 create/pop 的 init 由组件名直构）时包 alias。普通 interface 解析（init 为 %unk stub，
+        // 如 TestInterface.callf）直接用 declared——alias 会把显示退化为 %unk。
+        if (className !== Const_1.UNKNOWN_CLASS_NAME && declared.getDeclaringClassSignature().getClassName().endsWith('Interface')) {
             classSignature = new ArkSignature_1.AliasClassSignature(className, declared.getDeclaringClassSignature());
         }
         let newSubSignature;
         if (classSignature || newSubSignature) {
-            return new ArkSignature_1.MethodSignature(classSignature !== null && classSignature !== void 0 ? classSignature : declared.getDeclaringClassSignature(), newSubSignature !== null && newSubSignature !== void 0 ? newSubSignature : declared.getMethodSubSignature());
+            const result = new ArkSignature_1.MethodSignature(classSignature !== null && classSignature !== void 0 ? classSignature : declared.getDeclaringClassSignature(), newSubSignature !== null && newSubSignature !== void 0 ? newSubSignature : declared.getMethodSubSignature());
+            // display 归一化：alias 产物 intern formal + 双注册 declared 的 ArkMethod model——expr 的 route() formal 命中持 SigID（display 由 formal
+            // canonical 自持，不再依赖 expr 锚定传入实例）。
+            if (classSignature !== undefined) {
+                (0, ArkSignature_1.internAliasMethodSignature)(result, declared);
+            }
+            return result;
         }
         return declared;
     }
@@ -641,6 +655,10 @@ class IRInference {
             base.setType(new Type_2.PointerType(baseType, 1));
         }
     }
+    /**
+     * 判别联合——定义点 canonical（formal 分支，终点确定）与新构造值（params 分支，终点不确定）分流；null = 未解析。
+     * 泛型守卫（泛型字段不走定义点）为 cpp 侧遗留语义，照搬不改。
+     */
     static generateNewFieldSignature(ref, arkClass, baseType) {
         if (baseType instanceof Type_1.AliasType) {
             return this.generateNewFieldSignature(ref, arkClass, baseType.getOriginalType());
@@ -658,17 +676,21 @@ class IRInference {
         if (typeWithoutPtrOrRef instanceof Type_1.ClassType) {
             const property = propertyAndType === null || propertyAndType === void 0 ? void 0 : propertyAndType[0];
             if (property instanceof ArkField_1.ArkField && property.getCategory() !== ArkField_1.FieldCategory.ENUM_MEMBER && !(property.getType() instanceof Type_1.GenericType)) {
-                return property.getSignature();
+                // 定义点 canonical（formalId 直读）。
+                return { kind: 'formal', formalId: property.getFieldSigID(), staticFlag: property.isStatic(), type: property.getType() };
             }
             staticFlag =
                 typeWithoutPtrOrRef.getClassSignature().getClassName() === Const_1.DEFAULT_ARK_CLASS_NAME ||
                     ((property instanceof ArkField_1.ArkField || property instanceof ArkMethod_1.ArkMethod) && property.isStatic());
+            // Note: getClassSignature() (not getClassSigID()) — the class may still be unclear
+            // and live in the temp canonicalizer; the object overload interns it properly.
             signature = property instanceof ArkMethod_1.ArkMethod ? property.getSignature().getDeclaringClassSignature() : typeWithoutPtrOrRef.getClassSignature();
         }
         else if (typeWithoutPtrOrRef instanceof Type_1.ArrayType) {
             const property = propertyAndType === null || propertyAndType === void 0 ? void 0 : propertyAndType[0];
             if (property instanceof ArkField_1.ArkField) {
-                return property.getSignature();
+                // 定义点 canonical（Array 字段）。
+                return { kind: 'formal', formalId: property.getFieldSigID(), staticFlag: property.isStatic(), type: property.getType() };
             }
             return null;
         }
@@ -679,7 +701,10 @@ class IRInference {
         else {
             return null;
         }
-        return new ArkSignature_1.FieldSignature(fieldName, signature, propertyType !== null && propertyType !== void 0 ? propertyType : ref.getType(), staticFlag);
+        // 新构造值（终点不确定）——参数元组。
+        return signature instanceof ArkSignature_1.NamespaceSignature
+            ? { kind: 'params', fieldName, declaringOrID: signature.getNamespaceSigID(), type: propertyType !== null && propertyType !== void 0 ? propertyType : ref.getType(), staticFlag, namespaceDeclared: true }
+            : { kind: 'params', fieldName, declaringOrID: signature, type: propertyType !== null && propertyType !== void 0 ? propertyType : ref.getType(), staticFlag, namespaceDeclared: false };
     }
     static repairType(propertyType, fieldName, arkClass) {
         if (!propertyType || propertyType instanceof Type_1.UnknownType) {
@@ -723,7 +748,9 @@ class IRInference {
                     this.assignAnonMethod(scene.getMethod(type.getMethodSignature()), property);
                 }
                 if (type instanceof Type_1.UnknownType) {
-                    anonField.setSignature(new ArkSignature_1.FieldSignature(anonField.getName(), property.getDeclaringArkClass().getSignature(), new Type_1.FunctionType(property.getSignature())));
+                    // 类型对齐而非签名过户：同 assignAnonField——只补类型，不把匿名字段
+                    // intern 到声明类名下（防 model 顶替写穿）。
+                    anonField.getSignature().setType(new Type_1.FunctionType(property.getSignature()));
                 }
             }
         }
@@ -765,10 +792,12 @@ class IRInference {
             }
             const leftOp = lastStmt.getLeftOp();
             if (leftOp instanceof Ref_1.AbstractFieldRef) {
-                leftOp.setFieldSignature(property.getSignature());
+                // A2 快路径：定义点 canonical 回写（property 为 ArkField，ID 直读）。
+                leftOp.graduateToFormal(property.getFieldSigID());
             }
         }
-        anonField.setSignature(property.getSignature());
+        // 类型对齐而非签名过户（同 core 侧 assignAnonField，防 model 顶替写穿）。
+        anonField.getSignature().setType(property.getSignature().getType());
     }
     static inferAliasTypeExpr(expr, arkMethod) {
         const originalObject = expr.getOriginalObject();
@@ -946,8 +975,10 @@ class IRInference {
      *@ param sortedRefFiles - sorted reference file array
      */
     static findMtdImpl(mtd, implClasses) {
-        if (mtd.getImplementationSignature() || mtd.isDefaultArkMethod() ||
-            mtd.getName() === Const_1.INSTANCE_INIT_METHOD_NAME || mtd.getName() === Const_1.STATIC_INIT_METHOD_NAME) {
+        if (mtd.getImplementationSignature() ||
+            mtd.isDefaultArkMethod() ||
+            mtd.getName() === Const_1.INSTANCE_INIT_METHOD_NAME ||
+            mtd.getName() === Const_1.STATIC_INIT_METHOD_NAME) {
             return;
         }
         this.mapHeaderToSource(mtd, implClasses);
@@ -1031,7 +1062,7 @@ class IRInference {
     static getClassWithNameAndNamespace(clsName, file, namespaceName) {
         let tgtNamespacesInFile = [];
         if (namespaceName) {
-            tgtNamespacesInFile = ModelUtils_1.ModelUtils.getAllNamespacesInFile(file).filter(ns => ns.getName() === namespaceName);
+            tgtNamespacesInFile = file.getAllNamespacesUnderThisFile().filter(ns => ns.getName() === namespaceName);
         }
         const searchedClasses = [];
         if (tgtNamespacesInFile.length !== 0) {
@@ -1078,7 +1109,9 @@ class IRInference {
         const declSignature = mtdDecl.getDeclareSignatures();
         const declSignatureInMtdImpl = mtdImpl.getDeclareSignatures();
         if (declSignature) {
-            declSignatureInMtdImpl ? declSignatureInMtdImpl.push(...declSignature) : mtdImpl.setDeclareSignatures(declSignature);
+            // getDeclareSignatures() returns a rebuilt copy — write the merged list back explicitly.
+            const merged = declSignatureInMtdImpl ? [...declSignatureInMtdImpl, ...declSignature] : [...declSignature];
+            mtdImpl.setDeclareSignatures(merged);
         }
         // 3.The function implementation may be missing the existing modifiers (such as static) in the function declaration. Here we add
         mtdImpl.setModifiers(mtdDecl.getModifiers() | mtdImpl.getModifiers());

package/lib/frontend/cppFrontend/common/IRUtils.d.ts

@@ -15,6 +15,7 @@ export declare class IRUtils {
     static isTempLocal(value: Value): boolean;
     static findOperandIdx(stmt: Stmt, operand: Value): number;
     static adjustOperandOriginalPositions(stmt: Stmt, oldValue: Value, newValue: Value): void;
+    static generateDefaultPositionsPacked(count: number): number[];
     static generateDefaultPositions(count: number): FullPosition[];
     static buildLambdaCaptureListFromAst(lambdaExpr: CxxAstNode): string;
     private static formatLambdaCaptureEntry;

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

@@ -1 +1 @@
-{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/IRUtils.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAgC,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,qBAAa,OAAO;WACF,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAczC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAWvC,WAAW,CAAC,QAAQ,EAAE,IAAI,GAAG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;WAYjH,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,gBAAgB;WAS1H,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAIlC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM;WAYlD,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;WAqClF,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE;WAQvD,6BAA6B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAc3E,OAAO,CAAC,MAAM,CAAC,wBAAwB;WAezB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;WAmB5C,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI;WAc9E,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,EAAE;CAUnF"}
+{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/IRUtils.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAgC,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,qBAAa,OAAO;WACF,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAczC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAWvC,WAAW,CAAC,QAAQ,EAAE,IAAI,GAAG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;WAYjH,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,gBAAgB;WAS1H,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAIlC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM;WAYlD,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;WAqClF,8BAA8B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;WAUvD,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE;WAQvD,6BAA6B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAc3E,OAAO,CAAC,MAAM,CAAC,wBAAwB;WAezB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;WAmB5C,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI;WAiB9E,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,EAAE;CAUnF"}

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

@@ -78,11 +78,11 @@ class IRUtils {
         return index;
     }
     static adjustOperandOriginalPositions(stmt, oldValue, newValue) {
-        const operandOriginalPositions = stmt.getOperandOriginalPositions();
-        if (!operandOriginalPositions) {
+        const packed = stmt.getOperandPositionsPacked();
+        if (!packed) {
             return;
         }
-        const operandOriginalPositionSize = operandOriginalPositions.length;
+        const operandOriginalPositionSize = packed.length >> 1;
         const defUseSize = stmt.getDefAndUses().length;
         const oldValueUseSize = oldValue.getUses().length;
         const newValueUseSize = newValue.getUses().length;
@@ -91,30 +91,39 @@ class IRUtils {
         const fieldValueOffset = 2;
         if (oldValue instanceof Ref_1.AbstractRef && newValue instanceof Ref_1.AbstractRef) {
             if (newValue instanceof Ref_1.ArkStaticFieldRef) {
-                operandOriginalPositions.splice(oldValueIdx + baseValueOffset, oldValueUseSize - newValueUseSize);
+                packed.splice(2 * (oldValueIdx + baseValueOffset), 2 * (oldValueUseSize - newValueUseSize));
             }
             else if (oldValue instanceof Ref_1.ArkStaticFieldRef) {
-                operandOriginalPositions.splice(oldValueIdx + baseValueOffset, 0, ...IRUtils.generateDefaultPositions(newValueUseSize - oldValueUseSize));
+                packed.splice(2 * (oldValueIdx + baseValueOffset), 0, ...IRUtils.generateDefaultPositionsPacked(newValueUseSize - oldValueUseSize));
             }
             if (oldValue instanceof Ref_1.ArkInstanceFieldRef && newValue instanceof Ref_1.ArkArrayRef) {
                 if (operandOriginalPositionSize === defUseSize) {
                     // may not reserve positions for field name
-                    operandOriginalPositions.splice(oldValueIdx + fieldValueOffset, 0, ...IRUtils.generateDefaultPositions(newValueUseSize - oldValueUseSize));
+                    packed.splice(2 * (oldValueIdx + fieldValueOffset), 0, ...IRUtils.generateDefaultPositionsPacked(newValueUseSize - oldValueUseSize));
                 }
             }
             else if (oldValue instanceof Ref_1.ArkArrayRef && newValue instanceof Ref_1.ArkInstanceFieldRef) {
-                operandOriginalPositions.splice(oldValueIdx + fieldValueOffset, oldValueUseSize - newValueUseSize);
+                packed.splice(2 * (oldValueIdx + fieldValueOffset), 2 * (oldValueUseSize - newValueUseSize));
             }
         }
         else if (oldValue instanceof Expr_1.AbstractInvokeExpr && newValue instanceof Expr_1.AbstractInvokeExpr) {
             if (oldValueUseSize === newValueUseSize + 1) {
-                operandOriginalPositions.splice(oldValueIdx + baseValueOffset, 1);
+                packed.splice(2 * (oldValueIdx + baseValueOffset), 2);
             }
             else if (oldValueUseSize === newValueUseSize - 1) {
-                operandOriginalPositions.splice(oldValueIdx + baseValueOffset, 0, Position_1.FullPosition.DEFAULT);
+                packed.splice(2 * (oldValueIdx + baseValueOffset), 0, Position_1.FullPosition.DEFAULT.getFirstPacked(), Position_1.FullPosition.DEFAULT.getLastPacked());
             }
         }
     }
+    static generateDefaultPositionsPacked(count) {
+        const packed = [];
+        const first = Position_1.FullPosition.DEFAULT.getFirstPacked();
+        const last = Position_1.FullPosition.DEFAULT.getLastPacked();
+        for (let i = 0; i < count; i++) {
+            packed.push(first, last);
+        }
+        return packed;
+    }
     static generateDefaultPositions(count) {
         const defaultPositions = [];
         for (let i = 0; i < count; i++) {
@@ -171,7 +180,10 @@ class IRUtils {
         return '';
     }
     static analyzeLambdaDefaultCapture(captureList) {
-        const parts = captureList.split(',').map(p => p.trim()).filter(Boolean);
+        const parts = captureList
+            .split(',')
+            .map(p => p.trim())
+            .filter(Boolean);
         let defaultCaptureType = null;
         for (const part of parts) {
             if (part === '=') {

package/lib/frontend/cppFrontend/common/ModelUtils.d.ts

@@ -38,6 +38,25 @@ export declare class CxxModelUtils {
     static getStaticMethodInFileWithName(methodName: string, arkFile: ArkFile): ArkMethod | null;
     static getAccessibleAnonNamespacesInFile(file: ArkFile, namespace?: ArkNamespace): ArkNamespace[];
     static findPropertyInNamespace(name: string, namespace: ArkNamespace): ArkExport | 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: string, ctxClass: ArkClass, ctxMethod?: ArkMethod): ArkClass | null;
     static findSymbolInFileWithName(symbolName: string, arkClass: ArkClass, onlyType?: boolean): ArkExport | null;
     static isIOStreamObjectMatched(parameters: MethodParameter[], args: Value[], scene: Scene): boolean;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ModelUtils.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/ModelUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAY,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAI5F,OAAO,EAAE,UAAU,EAAc,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAiB,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAWjD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAiDvC;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAanE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAe/F;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAKrE;AAgHD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,GAAG,IAAI,CAqBnH;AA2FD,qBAAa,aAAa;WAER,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI;WAmCvG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,IAAI;WAyClF,oCAAoC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;WAW3F,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI;WAclF,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI;WAgBrF,iCAAiC,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE;WAY1F,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS;WAiBrF,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAE,OAAe,GAAG,SAAS,GAAG,IAAI;WA0C7G,uBAAuB,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO;CAiB7G"}
+{"version":3,"file":"ModelUtils.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/ModelUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAY,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAI5F,OAAO,EAAE,UAAU,EAAc,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAiB,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAWjD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAiDvC;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAanE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAe/F;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAKrE;AAgHD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,GAAG,IAAI,CAqBnH;AA2FD,qBAAa,aAAa;WAER,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI;WAmCvG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,IAAI;WAyClF,oCAAoC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;WAW3F,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI;WAclF,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI;WAgBrF,iCAAiC,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE;WAY1F,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS;IAiBnG;;;;;;;;;;;;;;;;;OAiBG;WACW,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI;WAwDnG,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAE,OAAe,GAAG,SAAS,GAAG,IAAI;WAgD7G,uBAAuB,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO;CAiB7G"}