fix(exprcall): NoVTable 跨 Mixin self. 调用按定义类解析 + this 前移

缺陷(TPV bootstrap 的 undefined symbol: <sha1>.StmtGenDeclMixin.translate_return
同根因):NoVTable 多继承下,BaseB.caller 内 self.helper()(helper 定义在兄弟
Mixin BaseA,经 Combined(BaseA, BaseB) 组合)被 mangle 成 BaseB.helper —— 用
调用者类做前缀,而定义符号是 BaseA.helper -> ld.lld undefined symbol。

修复(HandlesExprCall.py):
1. 调用端 MRO 回退失败后,全局扫描已注册类找方法定义类(兄弟 Mixin 兜底);
2. _adjust_this_for_inherited_method 支持"调用类不含定义类字段"场景:
   this 按组合布局前移 sizeof(定义类 struct)(BaseB* -> BaseA*)。

新增 Test/NoVTableCrossMixinTest 回归(caller()==42 通过),TestsOverview 记录。
This commit is contained in:
TermiNexus committed 2026-08-20 10:23:47 +08:00
1 parent 015d5c38ea
commit bd5d2467ab
4 files changed
+117 -1

No files matched your search

+50
View File
@@ -0,0 +1,50 @@
import t
import stdio
import testcheck
# ============================================================
# 复现:NoVTable 多继承下跨 Mixin self. 方法调用
#
# 缺陷:BaseB.caller 内 `self.helper()`(helper 定义在兄弟 Mixin BaseA,
# 经 Combined 多继承组合)被 mangle 成 `<sha1>.BaseB.helper`
# (用调用者自身/直接父类做前缀),而定义符号是 `<sha1>.BaseA.helper`
# → ld.lld undefined symbol(TPV 侧 StmtGenMixin.translate_stmt 调
# self.translate_return 同根因,符号成 StmtGenDeclMixin.translate_return)。
# 期望:按实际定义类(BaseA)做前缀,或按最终组合类(Combined)。
# ============================================================
@t.NoVTable
class BaseA:
a: t.CInt
def helper(self) -> int:
return self.a
@t.NoVTable
class BaseB:
b: t.CInt
def caller(self) -> int:
return self.helper()
@t.NoVTable
class Combined(BaseA, BaseB):
pass
def test_cross_mixin_call():
testcheck.section("Test 1: cross-mixin self. call")
c: Combined = Combined()
c.a = 42
c.b = 7
testcheck.check(c.caller() == 42,
"caller()==42 (BaseB->BaseA)",
"cross-mixin call fail")
def main() -> t.CInt:
testcheck.begin("NoVTableCrossMixinTest")
test_cross_mixin_call()
return testcheck.end()
+29
View File
@@ -0,0 +1,29 @@
{
"$schema": "https://raw.githubusercontent.com/TermiNexus/TransPyC/main/schemas/project-schema.json",
"name": "NoVTableCrossMixinTest",
"version": "1.0.0",
"source_dir": "./App",
"build_dir": "./.tpv_build",
"compiler": {
"cmd": "llc",
"flags": ["-filetype=obj", "-relocation-model=pic"]
},
"linker": {
"cmd": "clang++",
"flags": ["-lmsvcrt", "-lucrt", "-lpthread", "-lmingwex", "-lkernel32", "-Wl,--allow-multiple-definition"],
"output": "NoVTableCrossMixinTest.exe"
},
"includes": [
"../../includes"
],
"target": {
"triple": "x86_64-pc-windows-gnu",
"datalayout": "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
},
"options": {
"slice_level": 3,
"sha1_slice_level": 1,
"target": "llvm",
"strict_mode": true
}
}
+2
View File
@@ -100,6 +100,7 @@
| # | 项目 | 功能概述 | 关键特性 |
|---|------|---------|---------|
| 68 | [WebTest](WebTest/App/main.vp) | 网络栈:socket OOP、DNS 解析、requests.get HTTP 请求(依赖真实网络) | socket/requests、真实网络 I/O |
| 69 | [NoVTableCrossMixinTest](NoVTableCrossMixinTest/App/main.vp) | 回归:@t.NoVTable 多继承下跨 Mixin `self.` 方法调用——BaseB 内 `self.helper()` 调兄弟 Mixin BaseA.helper,须按定义类解析 + this 前移 sizeof(定义类) | 跨 Mixin 调用、NoVTable 多继承、this 调整 |
---
@@ -190,6 +191,7 @@
66. **ZlibTest** — zlib/Huffman(代码量最大)
67. **CPythonTest** — CPython C API 嵌入(依赖 Python 运行时)
68. **WebTest** — socket/requests(依赖真实网络,最后跑)
69. **NoVTableCrossMixinTest** — @t.NoVTable 跨 Mixin self. 调用(编译器缺陷回归)
---