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

refactor(php): 重构PHP编译器基础功能并优化代码结构

Browse Source 
- 移除不支持函数列表的硬编码定义
- 添加对不支持函数调用的运行时检查和错误报告
- 简化静态属性和类常量解析中的self关键字处理逻辑
- 修复类方法调用中self关键字的替换逻辑
- 将扩展模块入口声明从static改为全局作用域
- 重写gen_stub.php脚本的主函数结构和命令行参数处理
- 添加类信息和函数信息的独立生成选项
- 优化桩文件生成时的跳过提示输出
- 重构翻译器中的类解析方法实现
- 更新不支持函数列表包含更多动态函数
pull/1/head
韩天峰 7 months ago
parent ec106db274
commit 8b0c3d2b72
5 changed files with 311 additions and 273 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. 200
      bin/gen_stub.php
  2. 22
      src/Php/CompilerBase.php
  3. 24
      src/Php/Translator.php
  4. 10
      src/cpp/main.cc
  5. 2
      src/template/extension.cc.php

200
bin/gen_stub.php
Unescape View File

@ -16,14 +16,6 @@ use PhpParser\Node\Stmt\Trait_;
use PhpParser\PrettyPrinter\Standard;
use PhpParser\PrettyPrinterAbstract;
error_reporting(E_ALL);
ini_set("precision", "-1");
require __DIR__ . '/bootstrap.php';
$translator = new PhpAot\Php\Translator(ROOT_PATH);
$translator->setIndent("\t");
$translator->setIndentLevel(1);
const PHP_70_VERSION_ID = 70000;
const PHP_80_VERSION_ID = 80000;
const PHP_81_VERSION_ID = 80100;
@ -94,6 +86,7 @@ function processStubFile(string $stubFile, Context $context, bool $includeOnly =
$oldStubHash = extractStubHash($arginfoFile);
if ($stubHash === $oldStubHash && !$context->forceParse) {
/* Stub file did not change, do not regenerate. */
echo "Skipping $stubFile, stub hash unchanged\n";
return null;
}
}
@ -4238,11 +4231,16 @@ class FileInfo {
/**
* @return iterable<FuncInfo>
*/
public function getAllFuncInfos(): iterable {
yield from $this->funcInfos;
public function getAllFuncInfos(): iterable
{
global $genClass;
if ($genClass) {
foreach ($this->classInfos as $classInfo) {
yield from $classInfo->funcInfos;
}
} else {
yield from $this->funcInfos;
}
}
/** @return array<string, ConstInfo> */
@ -5171,6 +5169,8 @@ function generateArgInfoCode(
$generatedFuncInfos = [];
global $genClass;
$argInfoCode = generateCodeWithConditions(
$fileInfo->getAllFuncInfos(), "\n",
static function (FuncInfo $funcInfo) use (&$generatedFuncInfos, $fileInfo) {
@ -5221,14 +5221,16 @@ function generateArgInfoCode(
$code .= generateFunctionEntries(null, $fileInfo->funcInfos);
if ($genClass) {
foreach ($fileInfo->classInfos as $classInfo) {
$code .= generateFunctionEntries($classInfo->name, $classInfo->funcInfos, $classInfo->cond);
}
}
}
$php80MinimumCompatibility = $fileInfo->getMinimumPhpVersionIdCompatibility() === null || $fileInfo->getMinimumPhpVersionIdCompatibility() >= PHP_80_VERSION_ID;
if ($fileInfo->generateClassEntries) {
if ($genClass and $fileInfo->generateClassEntries) {
$declaredStrings = [];
$attributeInitializationCode = generateFunctionAttributeInitialization($fileInfo->funcInfos, $allConstInfos, $fileInfo->getMinimumPhpVersionIdCompatibility(), null, $declaredStrings);
$attributeInitializationCode .= generateGlobalConstantAttributeInitialization($fileInfo->constInfos, $allConstInfos, $fileInfo->getMinimumPhpVersionIdCompatibility(), null, $declaredStrings);
@ -6097,61 +6099,82 @@ function initPhpParser() {
$isInitialized = true;
}
$optind = null;
$options = getopt(
function main()
{
global $argv, $argc, $genClass, $translator;
error_reporting(E_ALL);
ini_set("precision", "-1");
require __DIR__ . '/bootstrap.php';
$translator = new PhpAot\Php\Translator(ROOT_PATH);
$translator->setIndent("\t");
$translator->setIndentLevel(1);
$opt_index = 0;
$options = getopt(
"fh",
[
"force-regeneration", "parameter-stats", "help", "verify", "verify-manual", "replace-predefined-constants",
"generate-classsynopses", "replace-classsynopses", "generate-methodsynopses", "replace-methodsynopses",
"generate-optimizer-info",
"generate-optimizer-info", "gen-class-info", "gen-func-info",
],
$optind
);
$context = new Context;
$printParameterStats = isset($options["parameter-stats"]);
$verify = isset($options["verify"]);
$verifyManual = isset($options["verify-manual"]);
$replacePredefinedConstants = isset($options["replace-predefined-constants"]);
$generateClassSynopses = isset($options["generate-classsynopses"]);
$replaceClassSynopses = isset($options["replace-classsynopses"]);
$generateMethodSynopses = isset($options["generate-methodsynopses"]);
$replaceMethodSynopses = isset($options["replace-methodsynopses"]);
$generateOptimizerInfo = isset($options["generate-optimizer-info"]);
$context->forceRegeneration = isset($options["f"]) || isset($options["force-regeneration"]);
$context->forceParse = $context->forceRegeneration || $printParameterStats || $verify || $verifyManual || $replacePredefinedConstants || $generateClassSynopses || $generateOptimizerInfo || $replaceClassSynopses || $generateMethodSynopses || $replaceMethodSynopses;
if (isset($options["h"]) || isset($options["help"])) {
$opt_index
);
$context = new Context;
$printParameterStats = isset($options["parameter-stats"]);
$verify = isset($options["verify"]);
$verifyManual = isset($options["verify-manual"]);
$replacePredefinedConstants = isset($options["replace-predefined-constants"]);
$generateClassSynopses = isset($options["generate-classsynopses"]);
$replaceClassSynopses = isset($options["replace-classsynopses"]);
$generateMethodSynopses = isset($options["generate-methodsynopses"]);
$replaceMethodSynopses = isset($options["replace-methodsynopses"]);
$generateOptimizerInfo = isset($options["generate-optimizer-info"]);
if (isset($options["gen-class-info"])) {
$genClass = true;
} elseif (isset($options["gen-func-info"])) {
$genClass = false;
} else {
die("Please specify whether to generate class or function info\n");
}
$context->forceRegeneration = isset($options["f"]) || isset($options["force-regeneration"]);
$context->forceParse = $context->forceRegeneration || $printParameterStats || $verify || $verifyManual || $replacePredefinedConstants || $generateClassSynopses || $generateOptimizerInfo || $replaceClassSynopses || $generateMethodSynopses || $replaceMethodSynopses;
if (isset($options["h"]) || isset($options["help"])) {
die("\nUsage: gen_stub.php [ -f | --force-regeneration ] [ --replace-predefined-constants ] [ --generate-classsynopses ] [ --replace-classsynopses ] [ --generate-methodsynopses ] [ --replace-methodsynopses ] [ --parameter-stats ] [ --verify ] [ --verify-manual ] [ --generate-optimizer-info ] [ -h | --help ] [ name.stub.php | directory ] [ directory ]\n\n");
}
}
$locations = array_slice($argv, $optind);
$locationCount = count($locations);
if ($replacePredefinedConstants && $locationCount < 2) {
$locations = array_slice($argv, $opt_index);
$locationCount = count($locations);
if ($replacePredefinedConstants && $locationCount < 2) {
die("At least one source stub path and a target manual directory has to be provided:\n./build/gen_stub.php --replace-predefined-constants ./ ../doc-en/\n");
}
if ($replaceClassSynopses && $locationCount < 2) {
}
if ($replaceClassSynopses && $locationCount < 2) {
die("At least one source stub path and a target manual directory has to be provided:\n./build/gen_stub.php --replace-classsynopses ./ ../doc-en/\n");
}
if ($generateMethodSynopses && $locationCount < 2) {
}
if ($generateMethodSynopses && $locationCount < 2) {
die("At least one source stub path and a target manual directory has to be provided:\n./build/gen_stub.php --generate-methodsynopses ./ ../doc-en/\n");
}
if ($replaceMethodSynopses && $locationCount < 2) {
}
if ($replaceMethodSynopses && $locationCount < 2) {
die("At least one source stub path and a target manual directory has to be provided:\n./build/gen_stub.php --replace-methodsynopses ./ ../doc-en/\n");
}
if ($verifyManual && $locationCount < 2) {
}
if ($verifyManual && $locationCount < 2) {
die("At least one source stub path and a target manual directory has to be provided:\n./build/gen_stub.php --verify-manual ./ ../doc-en/\n");
}
$manualTarget = null;
if ($replacePredefinedConstants || $replaceClassSynopses || $generateMethodSynopses || $replaceMethodSynopses || $verifyManual) {
}
$manualTarget = null;
if ($replacePredefinedConstants || $replaceClassSynopses || $generateMethodSynopses || $replaceMethodSynopses || $verifyManual) {
$manualTarget = array_pop($locations);
}
if ($locations === []) {
}
if ($locations === []) {
$locations = ['.'];
}
}
$fileInfos = [];
foreach (array_unique($locations) as $location) {
$fileInfos = [];
foreach (array_unique($locations) as $location) {
if (is_file($location)) {
// Generate single file.
$fileInfo = processStubFile($location, $context);
@ -6164,9 +6187,9 @@ foreach (array_unique($locations) as $location) {
echo "$location is neither a file nor a directory.\n";
exit(1);
}
}
}
if ($printParameterStats) {
if ($printParameterStats) {
$parameterStats = [];
foreach ($fileInfos as $fileInfo) {
@ -6182,25 +6205,25 @@ if ($printParameterStats) {
arsort($parameterStats);
echo json_encode($parameterStats, JSON_PRETTY_PRINT), "\n";
}
}
/** @var array<string, ClassInfo> $classMap */
$classMap = [];
/** @var array<string, FuncInfo> $funcMap */
$funcMap = [];
/** @var array<string, FuncInfo> $aliasMap */
$aliasMap = [];
/** @var array<string, ClassInfo> $classMap */
$classMap = [];
/** @var array<string, FuncInfo> $funcMap */
$funcMap = [];
/** @var array<string, FuncInfo> $aliasMap */
$aliasMap = [];
/** @var array<string, ConstInfo> $undocumentedConstMap */
$undocumentedConstMap = [];
/** @var array<string, ClassInfo> $undocumentedClassMap */
$undocumentedClassMap = [];
/** @var array<string, FuncInfo> $undocumentedFuncMap */
$undocumentedFuncMap = [];
/** @var array<int, string> $methodSynopsisWarnings */
$methodSynopsisWarnings = [];
foreach ($fileInfos as $fileInfo) {
/** @var array<string, ConstInfo> $undocumentedConstMap */
$undocumentedConstMap = [];
/** @var array<string, ClassInfo> $undocumentedClassMap */
$undocumentedClassMap = [];
/** @var array<string, FuncInfo> $undocumentedFuncMap */
$undocumentedFuncMap = [];
/** @var array<int, string> $methodSynopsisWarnings */
$methodSynopsisWarnings = [];
foreach ($fileInfos as $fileInfo) {
foreach ($fileInfo->getAllFuncInfos() as $funcInfo) {
$funcMap[$funcInfo->name->__toString()] = $funcInfo;
@ -6217,9 +6240,9 @@ foreach ($fileInfos as $fileInfo) {
$classMap[$classInfo->alias] = $classInfo;
}
}
}
}
if ($verify) {
if ($verify) {
$errors = [];
foreach ($funcMap as $aliasFunc) {
@ -6302,9 +6325,9 @@ if ($verify) {
echo "\n";
exit(1);
}
}
}
if ($replacePredefinedConstants || $verifyManual) {
if ($replacePredefinedConstants || $verifyManual) {
$predefinedConstants = replacePredefinedConstants($manualTarget, $context->allConstInfos, $undocumentedConstMap);
if ($replacePredefinedConstants) {
@ -6312,9 +6335,9 @@ if ($replacePredefinedConstants || $verifyManual) {
reportFilePutContents($filename, $content);
}
}
}
}
if ($generateClassSynopses) {
if ($generateClassSynopses) {
$classSynopsesDirectory = getcwd() . "/classsynopses";
$classSynopses = generateClassSynopses($classMap, $context->allConstInfos);
@ -6327,9 +6350,9 @@ if ($generateClassSynopses) {
reportFilePutContents("$classSynopsesDirectory/$filename", $content);
}
}
}
}
if ($replaceClassSynopses || $verifyManual) {
if ($replaceClassSynopses || $verifyManual) {
$classSynopses = replaceClassSynopses($manualTarget, $classMap, $context->allConstInfos, $undocumentedClassMap);
if ($replaceClassSynopses) {
@ -6337,9 +6360,9 @@ if ($replaceClassSynopses || $verifyManual) {
reportFilePutContents($filename, $content);
}
}
}
}
if ($generateMethodSynopses) {
if ($generateMethodSynopses) {
$methodSynopses = generateMethodSynopses($funcMap);
if (!file_exists($manualTarget)) {
mkdir($manualTarget);
@ -6356,9 +6379,9 @@ if ($generateMethodSynopses) {
reportFilePutContents($path, $content);
}
}
}
}
if ($replaceMethodSynopses || $verifyManual) {
if ($replaceMethodSynopses || $verifyManual) {
$methodSynopses = replaceMethodSynopses($manualTarget, $funcMap, $verifyManual, $methodSynopsisWarnings, $undocumentedFuncMap);
if ($replaceMethodSynopses) {
@ -6366,16 +6389,16 @@ if ($replaceMethodSynopses || $verifyManual) {
reportFilePutContents($filename, $content);
}
}
}
}
if ($generateOptimizerInfo) {
if ($generateOptimizerInfo) {
$filename = dirname(__FILE__, 2) . "/Zend/Optimizer/zend_func_infos.h";
$optimizerInfo = generateOptimizerInfo($funcMap);
reportFilePutContents($filename, $optimizerInfo);
}
}
if ($verifyManual) {
if ($verifyManual) {
foreach ($undocumentedConstMap as $constName => $info) {
if ($info->name instanceof ClassConstName || $info->isUndocumentable) {
continue;
@ -6399,4 +6422,7 @@ if ($verifyManual) {
echo "Warning: Missing method synopsis for $functionName()\n";
}
}
}
}
main();

22
src/Php/CompilerBase.php
Unescape View File

@ -53,13 +53,7 @@ class CompilerBase extends \PhpAot\Core\Translator
'float' => self::TYPE_FLOAT,
'bool' => self::TYPE_BOOL,
];
protected array $reservedNames;
protected array $unsupportedFunctions = [
'compact',
'extract'
];
protected array $globalHeaders = [
'phpx.h',
'phpx_helper.h',
@ -135,7 +129,6 @@ class CompilerBase extends \PhpAot\Core\Translator
$climate = new CLImate();
$this->climate = $climate;
// $this->noLiteralStrings = $climate->arguments->get('no-literal-strings');
$this->noLiteralStrings = true;
}
public function setPhpxDir($dir): void
@ -1295,6 +1288,9 @@ class CompilerBase extends \PhpAot\Core\Translator
$name = '';
} elseif ($expr->name->getType() === 'Name') {
$name = $this->parseIdentifier($expr->name);
if (in_array($name, $this->unsupportedFunctions)) {
$this->fatalError($expr, 'Unsupported function: `' . $name . '`');
}
$nativeFn = $this->findNativeFunction($name);
if ($nativeFn) {
return self::PREFIX . $nativeFn . '(' . $this->parseCallArgs($expr->args, $name) . ')';
@ -2106,10 +2102,7 @@ class CompilerBase extends \PhpAot\Core\Translator
} elseif ($var instanceof Node\Expr\ArrayDimFetch) {
return $this->parseIdentifier($var->var) . ".offsetExists(" . $this->parseIdentifier($var->dim) . ')';
} elseif ($var instanceof Node\Expr\StaticPropertyFetch) {
$class = $this->parseIdentifier($var->class);
$prop = $var->name;
$class = $class === 'self' ? $this->class : $class;
return 'php::hasStaticProperty("' . $class . '", ' . $this->identifierToStr($prop) . ')';
return 'php::hasStaticProperty(' . $this->identifierToStr($var->class) . ', ' . $this->identifierToStr($var->name) . ')';
} elseif ($var instanceof Node\Expr\PropertyFetch) {
$object = $var->var;
$prop = $var->name;
@ -2228,6 +2221,9 @@ class CompilerBase extends \PhpAot\Core\Translator
}
return $id;
} else {
if ($id === 'self') {
$id = $this->class;
}
return '"'. $id . '"';
}
}
@ -2245,8 +2241,9 @@ class CompilerBase extends \PhpAot\Core\Translator
$fn = 'php::concat({' . $this->identifierToStr($expr->class). ', "::", ' . $this->identifierToStr($expr->name) . '})';
} else {
$class = $this->parseIdentifier($expr->class);
$class = $class === 'self' ? $this->class : $class;
$method = $this->parseIdentifier($expr->name);
$fn = '"'. $class . '::' . $method . '"';
$fn = '"' . $class . '::' . $method . '"';
}
if (empty($expr->args)) {
return 'php::call(' . $fn . ')';
@ -2263,6 +2260,7 @@ class CompilerBase extends \PhpAot\Core\Translator
protected function parseClassConstFetch(Node\Expr\ClassConstFetch $expr): string
{
$class = $this->parseIdentifier($expr->class);
$class = ($class === 'self' or $class === 'this_') ? $this->class : $class;
$const = $this->parseIdentifier($expr->name);
return 'php::constant("' . $class . '::' . $const . '")';
}

24
src/Php/Translator.php
Unescape View File

@ -9,6 +9,13 @@ use PhpParser\NodeTraverser;
class Translator extends Preprocessor
{
protected bool $verbose = false;
protected array $unsupportedFunctions = [
'compact',
'extract',
'func_num_args',
'func_get_arg',
'func_get_args',
];
public function __construct(string $rootPath)
{
@ -358,15 +365,13 @@ class Translator extends Preprocessor
return $code;
}
protected function parseClass(Node\Stmt\Class_ $class): string
protected function genClassStubFile(Node\Stmt\Class_ $class, string $file): void
{
$this->class = $this->parseIdentifier($class->name);
if (!$this->stubFileIncluded) {
$genStubCmd = PHP_BINARY. ' ' . $this->rootPath . '/bin/gen_stub.php -f ' . $this->file;
$genStubCmd = PHP_BINARY. ' ' . $this->rootPath . '/bin/gen_stub.php --gen-class-info -f ' . $file;
$output = shell_exec($genStubCmd);
$this->climate->info('generate stub file: ' . $this->file);
$this->climate->info('generate stub file: ' . $file);
$this->climate->comment($genStubCmd);
$stubFilenameWithoutExtension = str_replace([".stub.php", '.php'], "", $this->file);
$stubFilenameWithoutExtension = str_replace([".stub.php", '.php'], "", $file);
$headerFile = $this->getArgInfoHeaderFile($stubFilenameWithoutExtension, true);
if (!str_starts_with($output, "Saved")) {
$this->fatalError($class, "failed to generate arginfo header file: `$headerFile`, output: $output");
@ -375,6 +380,13 @@ class Translator extends Preprocessor
$this->stubFileIncluded = true;
}
protected function parseClass(Node\Stmt\Class_ $class): string
{
$this->class = $this->parseIdentifier($class->name);
if (!$this->stubFileIncluded) {
$this->genClassStubFile($class, $this->file);
}
$this->classDef = new ClassDef();
$this->classDef->name = $this->class;
if ($class->extends) {

10
src/cpp/main.cc
Unescape View File

@ -9,9 +9,7 @@ extern php::Var argv;
extern void php_app_init();
extern void php_app_clean();
BEGIN_EXTERN_C()
extern zend_module_entry *get_module();
END_EXTERN_C()
extern zend_module_entry app_module_entry;
static void throw_exception(zend_object *ex) {
zend_bailout();
@ -21,10 +19,14 @@ int main(int cpp_argc, char **cpp_argv) {
php_embed_init(cpp_argc, cpp_argv);
zend_throw_exception_hook = throw_exception;
if (zend_register_module_ex(get_module(), MODULE_TEMPORARY) == NULL) {
if (zend_register_module_ex(&app_module_entry, MODULE_TEMPORARY) == NULL) {
zend_error(E_ERROR, "Failed to register module");
}
if (zend_startup_module_ex(&app_module_entry) == FAILURE) {
zend_error(E_ERROR, "Failed to startup module");
}
int rc = 0;
#if PPROF_ON
ProfilerStart("myapp.prof");

2
src/template/extension.cc.php
Unescape View File

@ -104,7 +104,7 @@ foreach ($this->nativeConstants as $name => $constant):
<?php endforeach; ?>
}
static zend_module_entry app_module_entry = {
zend_module_entry app_module_entry = {
STANDARD_MODULE_HEADER,
"app",
ext_functions,

Write Preview
Loading…
Cancel
Save