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

perf(compiler): mark generated table accessors noexcept (#105) --skip-tests

Browse Source
master
yavon007 4 weeks ago committed by GitHub
parent 453543e0c8
commit f63eab17a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 48 additions and 9 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. 38
      phpunit/src/CallCacheCodegenTest.php
  2. 3
      phpunit/src/CompilerBaseApiTest.php
  3. 16
      src/Translator.php

38
phpunit/src/CallCacheCodegenTest.php
Unescape View File

@ -43,6 +43,44 @@ final class CallCacheCodegenTest extends BaseTest
self::assertStringContainsString('typephp_get_method_call_cache(MethodCallCacheId cache_id)', $extension);
}
public function testSlotAccessorsDeclareNoexceptWithoutChangingResolvingLookups(): void
{
global $translator;
$compiler = CompilerTest::create(TYPEPHP_ROOT_PATH);
$translator = $compiler;
$compiler->setBuildMode(CompilerBase::BUILD_MODE_EXT);
$compiler->setTargetName('noexcept_cache_accessors');
$source = TYPEPHP_ROOT_PATH . '/phpunit/code/call-cache-sites.php';
$compiler->addFiles([$source]);
$compiler->prepareFile($source);
$compiler->convertFile($source);
$headerFile = tempnam(sys_get_temp_dir(), 'typephp-noexcept-');
try {
$compiler->genDataDeclarations($headerFile);
$header = file_get_contents($headerFile);
$extension = file_get_contents($compiler->genExtension());
foreach ([
'get_property_cache(PropertyCacheId cache_id)',
'typephp_get_method_call_cache(MethodCallCacheId cache_id)',
'typephp_get_function_call_cache(FunctionCallCacheId cache_id)',
] as $signature) {
self::assertStringContainsString($signature . ' noexcept;', $header);
self::assertStringContainsString($signature . ' noexcept {', $extension);
}
// Resolving lookups may throw and must retain that contract.
self::assertStringContainsString(
'get_persistent_func(PersistentFuncId func_id, const php::Str &func_name);',
$header,
);
self::assertStringContainsString(
'get_persistent_func(PersistentFuncId func_id, const php::Str &func_name) {',
$extension,
);
} finally {
unlink($headerFile);
}
}
public function testCallArgumentLimitRejectsBrokenUnboundedLowering(): void
{
$compiler = CompilerTest::create(TYPEPHP_ROOT_PATH);

3
phpunit/src/CompilerBaseApiTest.php
Unescape View File

@ -1499,7 +1499,7 @@ YAML);
$this->assertStringContainsString('extern php::Var _const_var_EXPORTED_ABI_STRING;', $dataHeader);
$this->assertStringContainsString('extern php::Var _const_var_EXPORTED_ABI_ARRAY;', $dataHeader);
$this->assertStringContainsString(
'ZEND_ATTRIBUTE_CONST php::Str &get_str(uint32_t index);',
'ZEND_ATTRIBUTE_CONST php::Str &get_str(uint32_t index) noexcept;',
$dataHeader,
);
$this->assertStringNotContainsString('_literal_strings', $dataHeader);
@ -1510,6 +1510,7 @@ YAML);
$extension = file_get_contents($extensionFile);
$this->assertStringContainsString('php::Str php_exported_defaults_arg_0_default_value() {', $extension);
$this->assertStringContainsString('static php::Str _literal_strings[]', $extension);
$this->assertStringContainsString('php::Str &get_str(uint32_t index) noexcept {', $extension);
$this->assertStringContainsString('return get_str(', $extension);
$this->assertStringContainsString('php::Array php_exported_variadic_arg_0_default_value() {', $extension);
}

16
src/Translator.php
Unescape View File

@ -975,7 +975,7 @@ class Translator extends Preprocessor
if ($this->literalStrings) {
$lines[] = 'ZEND_ATTRIBUTE_CONST ' . Type::STR . ' &'
. self::LITERAL_STRING_GETTER . '(uint32_t index);' . PHP_EOL;
. self::LITERAL_STRING_GETTER . '(uint32_t index) noexcept;' . PHP_EOL;
}
foreach ($this->constants as $name => $constant) {
@ -1003,9 +1003,9 @@ class Translator extends Preprocessor
$lines[] = 'zend_function *get_persistent_func(PersistentFuncId func_id, const php::Str &func_name);';
$lines[] = 'zend_function *get_persistent_method(PersistentFuncId func_id, const php::Str &method_name, PersistentClassId class_id, const php::Str &class_name);';
$lines[] = 'uint32_t get_persistent_prop(PersistentPropertyId prop_id, const php::Str &prop_name, const php::Str &class_name);' . PHP_EOL;
$lines[] = 'php::PropertyCacheSlot &get_property_cache(PropertyCacheId cache_id);' . PHP_EOL;
$lines[] = 'php::MethodCallCacheSlot &typephp_get_method_call_cache(MethodCallCacheId cache_id);' . PHP_EOL;
$lines[] = 'php::FunctionCallCacheSlot &typephp_get_function_call_cache(FunctionCallCacheId cache_id);' . PHP_EOL;
$lines[] = 'php::PropertyCacheSlot &get_property_cache(PropertyCacheId cache_id) noexcept;' . PHP_EOL;
$lines[] = 'php::MethodCallCacheSlot &typephp_get_method_call_cache(MethodCallCacheId cache_id) noexcept;' . PHP_EOL;
$lines[] = 'php::FunctionCallCacheSlot &typephp_get_function_call_cache(FunctionCallCacheId cache_id) noexcept;' . PHP_EOL;
foreach ($this->getClassLikesWithConstants() as $classDef) {
foreach ($classDef->constants as $constant) {
@ -1275,15 +1275,15 @@ uint32_t get_persistent_prop(PersistentPropertyId prop_id, const php::Str &prop_
return value - 1024;
}
php::PropertyCacheSlot &get_property_cache(PropertyCacheId cache_id) {
php::PropertyCacheSlot &get_property_cache(PropertyCacheId cache_id) noexcept {
return php_request_cache->property_cache_map[static_cast<uint32_t>(cache_id)];
}
php::MethodCallCacheSlot &typephp_get_method_call_cache(MethodCallCacheId cache_id) {
php::MethodCallCacheSlot &typephp_get_method_call_cache(MethodCallCacheId cache_id) noexcept {
return php_request_cache->method_call_cache_map[static_cast<uint32_t>(cache_id)];
}
php::FunctionCallCacheSlot &typephp_get_function_call_cache(FunctionCallCacheId cache_id) {
php::FunctionCallCacheSlot &typephp_get_function_call_cache(FunctionCallCacheId cache_id) noexcept {
return php_request_cache->function_call_cache_map[static_cast<uint32_t>(cache_id)];
}
CODE;
@ -1302,7 +1302,7 @@ CODE;
}
$code .= '};' . PHP_EOL . PHP_EOL;
$code .= 'ZEND_ATTRIBUTE_CONST ' . Type::STR . ' &'
. self::LITERAL_STRING_GETTER . '(uint32_t index) {' . PHP_EOL;
. self::LITERAL_STRING_GETTER . '(uint32_t index) noexcept {' . PHP_EOL;
$code .= $this->getIndent() . 'return ' . self::LITERAL_STRINGS . '[index];' . PHP_EOL;
$code .= '}' . PHP_EOL . PHP_EOL;
} else {

Write Preview
Loading…
Cancel
Save