From a7c5852016acf382199268c97f9db7fe820cdb64 Mon Sep 17 00:00:00 2001 From: ASDAlexander77 Date: Mon, 9 Nov 2026 18:57:10 +0000 Subject: [PATCH] obj["name"] of a class with a string indexer calls its get/set A class that declares `[key: string]: T` with get/set could be indexed only with a key that isn't a constant: `bag["name"]`, and `const k = "name"; bag[k]`, were read as the member `name` and failed with "can't resolve property/field/base 'name'". A constant key now goes to the indexer when it names no member of the class or a base class; a key that names a field, method, accessor or static member is still that member, as in TypeScript. This lets the default library's JsonValue (get/set by key) take `value["name"]` and `value["name"] = member`. Tests: 00class_indexer_string_key.ts (literal, const and let keys, writes, member names that win, one from a base class) under gc, rc, none and own, and export_/import_class_string_indexer.ts across a shared library under gc, rc and own. Co-Authored-By: Claude Opus 5.5 --- tslang/lib/TypeScript/MLIRGenAccessCall.cpp | 62 ++++++++++++++- tslang/test/tester/CMakeLists.txt | 11 +++ .../tests/00class_indexer_string_key.ts | 78 +++++++++++++++++++ .../tests/export_class_string_indexer.ts | 45 +++++++++++ .../tests/import_class_string_indexer.ts | 17 ++++ 5 files changed, 210 insertions(+), 3 deletions(-) create mode 100644 tslang/test/tester/tests/00class_indexer_string_key.ts create mode 100644 tslang/test/tester/tests/export_class_string_indexer.ts create mode 100644 tslang/test/tester/tests/import_class_string_indexer.ts diff --git a/tslang/lib/TypeScript/MLIRGenAccessCall.cpp b/tslang/lib/TypeScript/MLIRGenAccessCall.cpp index f8172cf67..9abb1d013 100644 --- a/tslang/lib/TypeScript/MLIRGenAccessCall.cpp +++ b/tslang/lib/TypeScript/MLIRGenAccessCall.cpp @@ -1316,6 +1316,57 @@ namespace mlirgen return mlir::Value(); } + // Whether `name` is a field, method, accessor or static member of the class or of a base class: + // what `obj["name"]` reaches before a string indexer does. + static bool classHasMember(ClassInfo::TypePtr classInfo, mlir::StringRef name) + { + auto id = MLIRHelper::TupleFieldName(name, classInfo->classType.getContext()); + if (classInfo->getStaticFieldIndex(id) >= 0 || classInfo->getMethodIndex(name) >= 0 + || classInfo->getGenericMethodIndex(name) >= 0 || classInfo->getAccessorIndex(name) >= 0) + { + return true; + } + + auto storageClass = cast(classInfo->classType.getStorageType()); + if (storageClass.getIndex(id) >= 0) + { + return true; + } + + for (auto &baseClass : classInfo->baseClasses) + { + if (classHasMember(baseClass, name)) + { + return true; + } + } + + return false; + } + + // Whether the class, or a base class, declares `[key: string]: T`. + static bool classHasStringIndexer(ClassInfo::TypePtr classInfo) + { + for (auto &indexInfo : classInfo->indexes) + { + if (indexInfo.indexSignature && indexInfo.indexSignature.getNumInputs() > 0 + && isa(indexInfo.indexSignature.getInput(0))) + { + return true; + } + } + + for (auto &baseClass : classInfo->baseClasses) + { + if (classHasStringIndexer(baseClass)) + { + return true; + } + } + + return false; + } + ValueOrLogicalResult MLIRGenImpl::mlirGenElementAccess(mlir::Location location, mlir::Value expression, mlir::Value argumentExpression, bool isConditionalAccess, const GenContext &genContext) { auto arrayType = expression.getType(); @@ -1418,10 +1469,15 @@ namespace mlirgen if (auto fieldName = argumentExpression.getDefiningOp()) { auto attr = fieldName.getValue(); - if (isa(attr)) + if (auto nameAttr = dyn_cast(attr)) { - // TODO: implement '[string]' access here - return mlirGenPropertyAccessExpression(location, expression, attr, isConditionalAccess, genContext); + // `obj["name"]` is the member `name`, as in TypeScript; only a key that names no + // member, of a class whose indexer takes a string, is the indexer's key + auto classInfo = getClassInfoByFullName(classType.getName().getValue()); + if (!classInfo || classHasMember(classInfo, nameAttr.getValue()) || !classHasStringIndexer(classInfo)) + { + return mlirGenPropertyAccessExpression(location, expression, attr, isConditionalAccess, genContext); + } } } diff --git a/tslang/test/tester/CMakeLists.txt b/tslang/test/tester/CMakeLists.txt index 3bc8c9a22..a5fd53c88 100644 --- a/tslang/test/tester/CMakeLists.txt +++ b/tslang/test/tester/CMakeLists.txt @@ -665,6 +665,7 @@ tslang_add_test(NAME test-compile-00-class-iterator-super COMMAND test-runner "$ tslang_add_test(NAME test-compile-00-class-symbol-iterator COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_symbol_iterator.ts") tslang_add_test(NAME test-compile-00-class-indexer COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer.ts") tslang_add_test(NAME test-compile-00-class-indexer-super COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_super.ts") +tslang_add_test(NAME test-compile-00-class-indexer-string-key COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_string_key.ts") tslang_add_test(NAME test-compile-00-class-from-tuple COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_from_tuple.ts") tslang_add_test(NAME test-compile-00-class-access-control COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_access_control.ts") tslang_add_test(NAME test-compile-00-class-protected-constructor COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_protected_constr.ts") @@ -1337,6 +1338,7 @@ tslang_add_test(NAME test-jit-00-class-iterator-super COMMAND test-runner -jit " tslang_add_test(NAME test-jit-00-class-symbol-iterator COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_symbol_iterator.ts") tslang_add_test(NAME test-jit-00-class-indexer COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer.ts") tslang_add_test(NAME test-jit-00-class-indexer-super COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_super.ts") +tslang_add_test(NAME test-jit-00-class-indexer-string-key COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_string_key.ts") tslang_add_test(NAME test-jit-00-class-from-tuple COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_from_tuple.ts") tslang_add_test(NAME test-jit-00-class-access-control COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_access_control.ts") tslang_add_test(NAME test-jit-00-class-protected-constructor COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_protected_constr.ts") @@ -1777,6 +1779,14 @@ foreach(class_value_mm rc none own) # ...and of a shared library's classes tslang_add_test(NAME test-jit-shared-export-import-class-values-${class_value_mm} COMMAND test-runner -jit -shared -mm=${class_value_mm} "${PROJECT_SOURCE_DIR}/test/tester/tests/import_class_values.ts" "${PROJECT_SOURCE_DIR}/test/tester/tests/export_class_values.ts") endforeach() +# `obj["name"]` of a class with a string indexer goes to its get/set unless "name" is a member: +# in one file under own (gc, rc and none run it above and in the corpus), and across a shared +# library's boundary under gc, rc and own +tslang_add_test(NAME test-jit-00-class-indexer-string-key-own COMMAND test-runner -jit -mm=own "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_string_key.ts") +foreach(string_indexer_mm gc rc own) + tslang_add_test(NAME test-compile-shared-export-import-class-string-indexer-${string_indexer_mm} COMMAND test-runner -shared -mm=${string_indexer_mm} "${PROJECT_SOURCE_DIR}/test/tester/tests/import_class_string_indexer.ts" "${PROJECT_SOURCE_DIR}/test/tester/tests/export_class_string_indexer.ts") + tslang_add_test(NAME test-jit-shared-export-import-class-string-indexer-${string_indexer_mm} COMMAND test-runner -jit -shared -mm=${string_indexer_mm} "${PROJECT_SOURCE_DIR}/test/tester/tests/import_class_string_indexer.ts" "${PROJECT_SOURCE_DIR}/test/tester/tests/export_class_string_indexer.ts") +endforeach() # ...and of @cpp classes implemented here (their vtables C++'s), under every memory model tslang_add_test(NAME test-compile-00-cpp-class-values COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00cpp_class_values.ts") foreach(class_value_mm gc rc none own) @@ -2476,6 +2486,7 @@ set(TSLANG_CORPUS 00class_generic.ts 00class_iface.ts 00class_indexer_super.ts + 00class_indexer_string_key.ts 00class_indexer.ts 00class_iterator_super.ts 00class_iterator.ts diff --git a/tslang/test/tester/tests/00class_indexer_string_key.ts b/tslang/test/tester/tests/00class_indexer_string_key.ts new file mode 100644 index 000000000..9cd18d218 --- /dev/null +++ b/tslang/test/tester/tests/00class_indexer_string_key.ts @@ -0,0 +1,78 @@ +// `obj["name"]` of a class with a string indexer: a key that names a member is that member, +// as in TypeScript; any other constant key goes to the indexer's get/set, as a variable key does. + +class Base { + label = "base"; +} + +class Bag extends Base { + count = 0; + + private keys: string[] = []; + private values: string[] = []; + + [key: string]: string; + + get(key: string): string { + for (let i = 0; i < this.keys.length; i++) { + if (this.keys[i] == key) { + return this.values[i]; + } + } + + return ""; + } + + set(key: string, value: string) { + let position = -1; + for (let i = 0; i < this.keys.length; i++) { + if (this.keys[i] == key) { + position = i; + } + } + + if (position < 0) { + position = this.keys.length; + this.keys.push(key + ""); + this.values.length = position + 1; + this.count++; + } + + // in one place: under -mm=own a parameter is taken on every path or none + this.values[position] = value; + } + + size() { + return this.count; + } +} + +function main() { + const bag = new Bag(); + + // literal keys: the indexer + bag["name"] = "Ann"; + bag["city"] = "Oslo"; + assert(bag["name"] == "Ann"); + assert(bag["city"] == "Oslo"); + assert(bag["missing"] == ""); + + bag["name"] = "Bob"; + assert(bag["name"] == "Bob"); + + // a const key is a constant too + const key = "city"; + assert(bag[key] == "Oslo"); + + // a variable key, as before + let other = "name"; + assert(bag[other] == "Bob"); + + // keys that name members still reach the members + assert(bag["count"] == 2); + assert(bag["label"] == "base"); + assert(bag["size"]() == 2); + + print(bag["name"], bag["city"], bag["count"]); + print("done."); +} diff --git a/tslang/test/tester/tests/export_class_string_indexer.ts b/tslang/test/tester/tests/export_class_string_indexer.ts new file mode 100644 index 000000000..a0b3f65ca --- /dev/null +++ b/tslang/test/tester/tests/export_class_string_indexer.ts @@ -0,0 +1,45 @@ +namespace M { + + // A class with a string indexer defined in the exporting module; the importer + // reaches it with constant keys (`bag["name"]`) as well as variable ones. + // Cross-module counterpart to 00class_indexer_string_key.ts. + + export class Bag { + private keys: string[] = []; + private values: string[] = []; + + [key: string]: string; + + get(key: string): string { + for (let i = 0; i < this.keys.length; i++) { + if (this.keys[i] == key) { + return this.values[i]; + } + } + + return ""; + } + + set(key: string, value: string) { + let position = -1; + for (let i = 0; i < this.keys.length; i++) { + if (this.keys[i] == key) { + position = i; + } + } + + if (position < 0) { + position = this.keys.length; + this.keys.push(key + ""); + this.values.length = position + 1; + } + + // in one place: under -mm=own a parameter is taken on every path or none + this.values[position] = value; + } + + get size() { + return this.keys.length; + } + } +} diff --git a/tslang/test/tester/tests/import_class_string_indexer.ts b/tslang/test/tester/tests/import_class_string_indexer.ts new file mode 100644 index 000000000..508dba4be --- /dev/null +++ b/tslang/test/tester/tests/import_class_string_indexer.ts @@ -0,0 +1,17 @@ +import './export_class_string_indexer' + +function main() { + const bag = new M.Bag(); + bag["name"] = "Ann"; + bag["city"] = "Oslo"; + bag["name"] = "Bob"; + + let key = "city"; + assert(bag["name"] == "Bob"); + assert(bag[key] == "Oslo"); + + // a key that names a member is the member + assert(bag["size"] == 2); + + print("done."); +}