Commit Graph

60966 Commits

Author SHA1 Message Date
George Peter Banyard
0eb0f64455 Use zend_string for DBA update handler 2021-11-11 11:12:41 +00:00
George Peter Banyard
f8e15f1ed6 Use zend_string for DBA fetch handler 2021-11-11 11:12:41 +00:00
George Peter Banyard
c42336b8b8 Drop dba_lock.name element
This is unused
2021-11-11 11:12:41 +00:00
Dmitry Stogov
4508196cc2 Merge branch 'PHP-8.1'
* PHP-8.1:
  JIT: Fixed incorrect MOD into BW_AND optimization
2021-11-10 21:18:22 +03:00
Dmitry Stogov
4aa73bbfc4 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  JIT: Fixed incorrect MOD into BW_AND optimization
2021-11-10 21:18:15 +03:00
Dmitry Stogov
64915775a7 JIT: Fixed incorrect MOD into BW_AND optimization 2021-11-10 21:14:41 +03:00
Dmitry Stogov
30307b924f Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed test
2021-11-10 20:21:33 +03:00
Dmitry Stogov
cfde86a0b2 Fixed test 2021-11-10 20:21:07 +03:00
Dmitry Stogov
c9d0671487 Merge branch 'PHP-8.1'
* PHP-8.1:
  Tracing JIT: Fixed register allocation
2021-11-10 20:07:41 +03:00
Dmitry Stogov
e4d0b012d5 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Tracing JIT: Fixed register allocation
2021-11-10 20:07:32 +03:00
Dmitry Stogov
3081423706 Tracing JIT: Fixed register allocation
In case of side exit on ADD/SUB/MUL overflow source registers must be kept unchanged
2021-11-10 20:04:25 +03:00
Nikita Popov
edb6e3348c Fix property name typo in var_export tests 2021-11-10 15:15:49 +01:00
Dmitry Stogov
745451b390 Merge branch 'PHP-8.1'
* PHP-8.1:
  Tracing JIT: Fixed incorrect assumption about in-memeory zval type
2021-11-10 16:46:34 +03:00
Dmitry Stogov
c699629916 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Tracing JIT: Fixed incorrect assumption about in-memeory zval type
2021-11-10 16:46:25 +03:00
Dmitry Stogov
3dba5566ce Tracing JIT: Fixed incorrect assumption about in-memeory zval type 2021-11-10 16:46:09 +03:00
hassan
888bec1be3
Merge duplicate identical conditions in PDO (#7638) 2021-11-10 12:21:04 +00:00
Nikita Popov
8b561d33dc Declare properties in SOAP tests
In preparation for
https://wiki.php.net/rfc/deprecate_dynamic_properties.
2021-11-10 11:00:37 +01:00
Dmitry Stogov
6d572bc65a Merge branch 'PHP-8.1'
* PHP-8.1:
  JIT: Fixed memory leak
2021-11-10 12:50:21 +03:00
Dmitry Stogov
10575b7bc1 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  JIT: Fixed memory leak
2021-11-10 12:50:14 +03:00
Dmitry Stogov
45683703f1 JIT: Fixed memory leak 2021-11-10 12:49:20 +03:00
Dmitry Stogov
2c8ec71f00 Merge branch 'PHP-8.1'
* PHP-8.1:
  Tracing JIT: Fixed incorrect tracing type inference
2021-11-10 11:13:57 +03:00
Dmitry Stogov
936c6df022 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Tracing JIT: Fixed incorrect tracing type inference
2021-11-10 11:13:48 +03:00
Dmitry Stogov
203c1b807e Tracing JIT: Fixed incorrect tracing type inference
There are some cases when IS_VAR/IS_TMP_VAR variables are set to IS_UNDEF.
TODO: It would be better to switch to IS_NULL in master.
2021-11-10 11:10:44 +03:00
Dmitry Stogov
1a4f49f1fe Use cheaper memchr() instead of php_memnstr() 2021-11-10 10:19:49 +03:00
Dmitry Stogov
085b360abb Improve strtr(), str_replace() and substr_count() performance
Use SSE2 to calculate number of occurrences of a given character in a string
2021-11-09 22:26:37 +03:00
Kamil Tekiela
c149d37611
Merge branch 'PHP-8.1'
* PHP-8.1:
  mysqli_reap_async_query error reporting (#7629)
2021-11-09 18:17:37 +00:00
Kamil Tekiela
15a2c8660b
mysqli_reap_async_query error reporting (#7629) 2021-11-09 18:16:36 +00:00
Nikita Popov
4f3c0efeb0 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix bug #81441
2021-11-09 16:23:46 +01:00
Nikita Popov
425e70c11c Fix bug #81441
Zero-initialize the sa4/sa6 structures. On musl sin6_scope_id is
used by getnameinfo() without NI_NUMERICHOST flag. In the interest
of being conservative simply zero out everything.
2021-11-09 16:23:11 +01:00
Nikita Popov
cd3fbb1b15 Fix file name clash in phar test 2021-11-09 15:52:10 +01:00
Dmitry Stogov
6e3f3cbaee Improve strtr() performance using SSE2 instructions 2021-11-09 17:32:27 +03:00
Kamil Tekiela
304f758bf8 Remove redundant checks
I am unsure what this condition was actually supposed to do, but it
seems like it was only checking for 1 (loose check)
2021-11-09 14:00:30 +00:00
Kamil Tekiela
c5cc4c813c Fix grammar in code comments 2021-11-09 14:00:30 +00:00
Kamil Tekiela
0ac7dacc23 Fix PHP DocBlock 2021-11-09 14:00:30 +00:00
Kamil Tekiela
97bef32976 Invalid condition in connect.inc 2021-11-09 14:00:30 +00:00
Kamil Tekiela
1b3a73bbd7 Refactor have_innodb function 2021-11-09 14:00:30 +00:00
Nikita Popov
86379b6710 Warn if return type on internal __toString() is missing 2021-11-09 10:24:41 +01:00
Nikita Popov
85acad5688 Merge branch 'PHP-8.1'
* PHP-8.1:
  Add string return type to __toString() of internal classes
2021-11-09 10:21:16 +01:00
Nikita Popov
277caa1db0 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Add string return type to __toString() of internal classes
2021-11-09 10:20:36 +01:00
Nikita Popov
a551b08307 Add string return type to __toString() of internal classes
Same as with userland classes, automatically add a string return
type to __toString() methods in internal classes, so the signature
is compatible with Stringable.
2021-11-09 10:17:26 +01:00
Dmitry Stogov
fc60f2cce4 Merge branch 'PHP-8.1'
* PHP-8.1:
  Tracing JIT: Fixed missed type store in deoptimization code
2021-11-09 00:56:42 +03:00
Dmitry Stogov
eda9d7ac22 Tracing JIT: Fixed missed type store in deoptimization code 2021-11-09 00:55:40 +03:00
Dmitry Stogov
b7f19f2674 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed incorrect reference counter inference
2021-11-08 20:55:09 +03:00
Dmitry Stogov
9bd490dc33 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fixed incorrect reference counter inference
2021-11-08 20:54:45 +03:00
Dmitry Stogov
535a0553e8 Fixed incorrect reference counter inference 2021-11-08 20:54:17 +03:00
Dmitry Stogov
85aa735bc7 Merge branch 'PHP-8.1'
* PHP-8.1:
  JIT: Fixed incorrect guard elimination
2021-11-08 20:09:40 +03:00
Dmitry Stogov
9db900926c Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  JIT: Fixed incorrect guard elimination
2021-11-08 20:09:01 +03:00
Dmitry Stogov
8fe808207f JIT: Fixed incorrect guard elimination 2021-11-08 20:08:39 +03:00
Nikita Popov
53df29bc29 Drop pi nodes for both old/new pred in replace_predecessor
We also need to drop pi nodes for new_pred here, as the pi node
restriction for new_pred is not necessarily true for control
coming from old_pred as well.

Fixes oss-fuzz #40782.
2021-11-08 14:56:42 +01:00
Dmitry Stogov
f823999d49 Merge branch 'PHP-8.1'
* PHP-8.1:
  Don't call _zend_hash_index_find() for packed arrays
2021-11-08 13:14:11 +03:00