aot
/
compiler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(php): 重构属性访问解析逻辑以提高代码可读性

Browse Source 
- 提取实例属性获取逻辑到独立方法 resolveInstancePropertyFetchTarget
- 提取静态属性获取逻辑到独立方法 resolveStaticPropertyFetchTarget
- 添加 InstancePropertyFetchTarget 和 StaticPropertyFetchTarget 数据结构
- 优化原生实例属性获取的条件判断流程
- 简化原生静态属性获取的处理逻辑
- 提取静态属性引用注册逻辑到独立方法 registerStaticPropertyRef
- 改进代码结构以提高可维护性和可测试性
pull/4/head
韩天峰 2 months ago
parent 036e2befc4
commit 8711545637
1 changed files with 158 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 203
      src/Php/CompilerBase.php

203
src/Php/CompilerBase.php
Unescape View File

@ -43,12 +43,14 @@ use PhpAot\Php\Platform\Macos;
use PhpAot\Php\Platform\PlatformBase;
use PhpAot\Php\Platform\PlatformFactory;
use PhpAot\Php\Platform\Windows;
use PhpAot\Php\Resolver\InstancePropertyFetchTarget;
use PhpAot\Php\Resolver\PropertyAccessContext;
use PhpAot\Php\Resolver\NativePropertyAccess;
use PhpAot\Php\Resolver\PropertyAccessResult;
use PhpAot\Php\Resolver\PropertyAccessResolver;
use PhpAot\Php\Resolver\PropertyAssignTypeInfo;
use PhpAot\Php\Resolver\StaticPropertyFetchResolution;
use PhpAot\Php\Resolver\StaticPropertyFetchTarget;
use PhpParser\Modifiers;
use PhpParser\Node;
use PhpParser\Node\ArrayItem;
@ -4861,27 +4863,38 @@ class CompilerBase extends \PhpAot\Core\Translator implements PropertyAccessCont
protected function getPropertyIdentifier(Expr\PropertyFetch $expr, NodeAbstract $object, NodeAbstract $property): ?string
{
if ($this->isVarExpr($object) and $this->isIdExpr($property)) {
$target = $this->resolveInstancePropertyFetchTarget($object, $property);
if ($target !== null) {
$result = $this->resolveNativeInstanceProperty($expr, $target->property, $target->class);
if ($result !== null) {
return $this->applyNativePropertyAccessResult($expr, $result);
}
}
return $this->identifierToStr($property, literal: true);
}
private function resolveInstancePropertyFetchTarget(
NodeAbstract $object,
NodeAbstract $property,
): ?InstancePropertyFetchTarget {
if (!$this->isVarExpr($object) or !$this->isIdExpr($property)) {
return null;
}
$objectName = $this->parseIdentifier($object);
$propertyName = $this->parseIdentifier($property);
$nativeProperty = null;
if ($objectName === 'this_') {
if ($this->classDef->trait) {
goto _dynamic_attr;
}
$result = $this->resolveNativeInstanceProperty($expr, $propertyName, $this->getFullClassName());
$nativeProperty = $result ? $this->applyNativePropertyAccessResult($expr, $result) : null;
} elseif ($this->isTypedObject($objectName)) {
$className = $this->getObjectType($objectName);
$result = $this->resolveNativeInstanceProperty($expr, $propertyName, $className);
$nativeProperty = $result ? $this->applyNativePropertyAccessResult($expr, $result) : null;
return null;
}
if ($nativeProperty) {
return $nativeProperty;
return new InstancePropertyFetchTarget($propertyName, $this->getFullClassName());
}
if ($this->isTypedObject($objectName)) {
return new InstancePropertyFetchTarget($propertyName, $this->getObjectType($objectName));
}
_dynamic_attr:
return $this->identifierToStr($property, literal: true);
return null;
}
protected function parsePropertyFetch(Expr\PropertyFetch $expr, bool $update = false): string
@ -4898,14 +4911,42 @@ class CompilerBase extends \PhpAot\Core\Translator implements PropertyAccessCont
$def = $this->getNativePropertyDef($expr);
if ($def and $this->nativeTypes) {
$propName = $this->parseIdentifier($property);
$typedFetch = $this->emitNativeInstancePropertyTypedFetch(
$expr,
$objectVar,
$propName,
$id,
$def,
$getProperty,
);
if ($typedFetch !== null) {
return $typedFetch;
}
}
if ($def) {
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_DYNAMIC);
}
return $getProperty;
}
private function emitNativeInstancePropertyTypedFetch(
Expr\PropertyFetch $expr,
string $objectVar,
string $propName,
string $propertyId,
PropertyDef $def,
string $getter,
): ?string {
$propVar = $this->getObjectPropVarName($objectVar, $propName);
if ($objectVar === 'this_') {
if ($this->canHoistObjectProp($objectVar, $propName)) {
if (!$this->canHoistObjectProp($objectVar, $propName)) {
return null;
}
if (!$this->hasObjectPropVar($propVar)) {
$info = $this->getHoistedObjectPropInfo($def->type);
$this->context->objectProps[$propVar] = [
'type' => $info['type'],
'getter' => $getProperty,
'getter' => $getter,
'kind' => $info['kind'],
];
}
@ -4913,19 +4954,17 @@ class CompilerBase extends \PhpAot\Core\Translator implements PropertyAccessCont
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_VAR);
return $propVar;
}
} elseif ($this->canHoistStableObjectProp($objectVar, $propName)) {
// SSA-stable object: lazily create reference at first access point
$result = $this->hoistStableObjectProp($objectVar, $propName, $id, $def->type);
if (!$this->canHoistStableObjectProp($objectVar, $propName)) {
return null;
}
// SSA-stable object: lazily create reference at first access point.
$result = $this->hoistStableObjectProp($objectVar, $propName, $propertyId, $def->type);
$this->setNativePropertyVar($expr, $result);
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_VAR);
return $result;
}
}
if ($def) {
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_DYNAMIC);
}
return $getProperty;
}
protected function parseMagicConst(MagicConst $expr): string
{
@ -5785,7 +5824,31 @@ class CompilerBase extends \PhpAot\Core\Translator implements PropertyAccessCont
protected function resolveNativeStaticPropertyFetch(Expr\StaticPropertyFetch $expr): ?StaticPropertyFetchResolution
{
if ($this->isNameExpr($expr->class) and $this->isIdExpr($expr->name)) {
$target = $this->resolveStaticPropertyFetchTarget($expr);
if ($target === null) {
return null;
}
if ($target->isDynamic()) {
return new StaticPropertyFetchResolution(null, $target->dynamicExpression, false);
}
$class = $target->class;
if ($class === null) {
return null;
}
$result = $this->resolveNativeStaticProperty($expr, $target->property, $class);
if ($result !== null) {
$expression = $this->applyNativePropertyAccessResult($expr, $result);
return new StaticPropertyFetchResolution($class, $expression, true);
}
return null;
}
private function resolveStaticPropertyFetchTarget(Expr\StaticPropertyFetch $expr): ?StaticPropertyFetchTarget
{
if (!$this->isNameExpr($expr->class) or !$this->isIdExpr($expr->name)) {
return null;
}
$class = $this->parseIdentifier($expr->class);
$propertyName = $this->parseIdentifier($expr->name);
if ($class === 'static') {
@ -5794,24 +5857,18 @@ class CompilerBase extends \PhpAot\Core\Translator implements PropertyAccessCont
if ($class === 'self') {
if ($this->classDef->trait) {
$expression = Symbol::getStaticProperty() . '(' . Symbol::getCalledCe() . ', ' . $this->getLiteralString($propertyName) . ')';
return new StaticPropertyFetchResolution(null, $expression, false);
return new StaticPropertyFetchTarget($propertyName, null, $expression);
}
$class = $this->getFullClassName();
} elseif ($class === 'parent') {
return new StaticPropertyFetchTarget($propertyName, $this->getFullClassName(), null);
}
if ($class === 'parent') {
if (!$this->classDef->extends) {
$this->fatalError($expr, 'Cannot access parent:: when current class does not extend any class');
}
$class = $this->classDef->extends;
} else {
$class = $this->getNamespacedClassName($class);
return new StaticPropertyFetchTarget($propertyName, $this->classDef->extends, null);
}
$result = $this->resolveNativeStaticProperty($expr, $propertyName, $class);
if ($result !== null) {
$expression = $this->applyNativePropertyAccessResult($expr, $result);
return new StaticPropertyFetchResolution($class, $expression, true);
}
}
return null;
return new StaticPropertyFetchTarget($propertyName, $this->getNamespacedClassName($class), null);
}
private function createPropertyAccessResolver(): PropertyAccessResolver
@ -5902,49 +5959,55 @@ class CompilerBase extends \PhpAot\Core\Translator implements PropertyAccessCont
if ($resolution !== null) {
$nativeProp = $resolution->expression;
$def = $this->getNativePropertyDef($expr);
if ($this->nativeTypes && $def && $resolution->class !== null) {
$class = $resolution->class;
if ($this->nativeTypes && $def && $class !== null) {
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_VAR);
return $this->emitNativeStaticPropertyTypedFetch($expr, $class, $def, $nativeProp);
}
if ($resolution->nativeProperty && $class !== null) {
$classPtr = $this->getClassEntryPtr($class);
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_DYNAMIC);
return Symbol::getStaticProperty() . '(' . $classPtr . ', ' . $nativeProp . ')';
} else {
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_DYNAMIC);
return $nativeProp;
}
}
return null;
}
private function emitNativeStaticPropertyTypedFetch(
Expr\StaticPropertyFetch $expr,
string $class,
PropertyDef $def,
string $nativeProp,
): string {
$info = $this->getHoistedObjectPropInfo($def->type);
$propName = $this->parseIdentifier($expr->name);
$refVar = '_static_' . str_replace('\\', '_', $resolution->class) . '_' . $propName;
$refVar = '_static_' . str_replace('\\', '_', $class) . '_' . $propName;
$this->registerStaticPropertyRef($refVar, $class, $nativeProp, $info);
if ($info['kind'] === 'zval') {
if (!isset($this->context->staticPropRefs[$refVar])) {
$classPtr = $this->getClassEntryPtr($resolution->class);
$this->context->staticPropRefs[$refVar] = [
'type' => $info['type'],
'classPtr' => $classPtr,
'offsetExpr' => $nativeProp,
'kind' => $info['kind'],
];
}
$helper = $def->type === self::TYPE_FLOAT ? 'php_aot_static_float_ref' : 'php_aot_static_int_ref';
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_VAR);
return $helper . '(' . $refVar . ')';
}
if (!isset($this->context->staticPropRefs[$refVar])) {
$classPtr = $this->getClassEntryPtr($resolution->class);
$this->context->staticPropRefs[$refVar] = [
'type' => $info['type'],
'classPtr' => $classPtr,
'offsetExpr' => $nativeProp,
'kind' => $info['kind'],
];
}
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_VAR);
return $refVar;
}
if ($resolution->nativeProperty && $resolution->class !== null) {
$classPtr = $this->getClassEntryPtr($resolution->class);
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_DYNAMIC);
return Symbol::getStaticProperty() . '(' . $classPtr . ', ' . $nativeProp . ')';
} else {
$this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_DYNAMIC);
return $nativeProp;
}
private function registerStaticPropertyRef(string $refVar, string $class, string $offsetExpr, array $info): void
{
if (isset($this->context->staticPropRefs[$refVar])) {
return;
}
return null;
$this->context->staticPropRefs[$refVar] = [
'type' => $info['type'],
'classPtr' => $this->getClassEntryPtr($class),
'offsetExpr' => $offsetExpr,
'kind' => $info['kind'],
];
}
protected function parseStaticPropertyFetch(Expr\StaticPropertyFetch $expr): string

Write Preview
Loading…
Cancel
Save