archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Pass hash table directly in tokenizer (#18650)

Browse source 
This avoids dereferences by Z_ARRVAL_P().
This commit is contained in:
Niels Dossche 2025-05-25 14:23:50 +02:00 • committed by GitHub
parent 7f59fccd52
commit 085abe932a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/tokenizer/tokenizer.c
View file

@ -280,7 +280,7 @@ static zend_string *make_str(unsigned char *text, size_t leng, HashTable *intern
}
static void add_token(
zval *return_value, int token_type, unsigned char *text, size_t leng, int lineno,
HashTable *return_value_ht, int token_type, unsigned char *text, size_t leng, int lineno,
zend_class_entry *token_class, HashTable *interned_strings) {
zval token;
if (token_class) {
@ -315,7 +315,7 @@ static void add_token(
} else {
ZVAL_STR(&token, make_str(text, leng, interned_strings));
}
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &token);
zend_hash_next_index_insert_new(return_value_ht, &token);
}
static bool tokenize(zval *return_value, zend_string *source, zend_class_entry *token_class)
@ -337,11 +337,13 @@ static bool tokenize(zval *return_value, zend_string *source, zend_class_entry *
zend_hash_init(&interned_strings, 0, NULL, NULL, 0);
array_init(return_value);
HashTable *return_value_ht = Z_ARRVAL_P(return_value);
while ((token_type = lex_scan(&token, NULL))) {
ZEND_ASSERT(token_type != T_ERROR);
add_token(
return_value, token_type, zendtext, zendleng, token_line,
return_value_ht, token_type, zendtext, zendleng, token_line,
token_class, &interned_strings);
if (Z_TYPE(token) != IS_UNDEF) {
@ -358,7 +360,7 @@ static bool tokenize(zval *return_value, zend_string *source, zend_class_entry *
/* fetch the rest into a T_INLINE_HTML */
if (zendcursor < zendlimit) {
add_token(
return_value, T_INLINE_HTML, zendcursor, zendlimit - zendcursor,
return_value_ht, T_INLINE_HTML, zendcursor, zendlimit - zendcursor,
token_line, token_class, &interned_strings);
}
break;
@ -383,7 +385,7 @@ static bool tokenize(zval *return_value, zend_string *source, zend_class_entry *
}
struct event_context {
zval *tokens;
HashTable *tokens;
zend_class_entry *token_class;
};
@ -428,7 +430,7 @@ static void on_event(
ctx->tokens, token, (unsigned char *) text, length, line, ctx->token_class, NULL);
break;
case ON_FEEDBACK: {
HashTable *tokens_ht = Z_ARRVAL_P(ctx->tokens);
HashTable *tokens_ht = ctx->tokens;
zval *token_zv, *id_zv = NULL;
ZEND_HASH_REVERSE_FOREACH_VAL(tokens_ht, token_zv) {
id_zv = extract_token_id_to_replace(token_zv, text, length);
@ -469,7 +471,7 @@ static bool tokenize_parse(
zend_prepare_string_for_scanning(&source_zval, ZSTR_EMPTY_ALLOC());
array_init(&token_stream);
ctx.tokens = &token_stream;
ctx.tokens = Z_ARRVAL(token_stream);
ctx.token_class = token_class;
CG(ast) = NULL;