Merge branch 'master' into refactor_bcmath_str2num

Author: SakiTakamachi

.github/workflows/nightly.yml

@@ -824,6 +824,7 @@ jobs:
         with:
           key: "${{github.job}}-${{hashFiles('php/main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: build PHP
         run: |
           cd php

.github/workflows/push.yml

@@ -116,6 +116,7 @@ jobs:
           # job id, not the job name)
           key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
@@ -170,6 +171,7 @@ jobs:
         with:
           key: "${{github.job}}-${{matrix.os}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-macos
         with:
@@ -246,6 +248,7 @@ jobs:
         with:
           key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         run: |
           set -x

.gitignore

@@ -78,7 +78,7 @@ Makefile
 Makefile.fragments
 Makefile.objects
 
-# Directories for shared object files and headers generated by `./configure`
+# Directories for shared object files generated by `./configure`
 libs/
 modules/
 
@@ -166,11 +166,6 @@ php
 # Extensions files
 # ------------------------------------------------------------------------------
 
-# Miscellaneous extensions files
-/ext/opcache/jit/zend_jit_x86.c
-/ext/opcache/jit/zend_jit_arm64.c
-/ext/opcache/minilua
-
 # Generated by `cd ext/name && phpize && ./configure`
 /ext/*/build/
 /ext/*/configure.ac

CODING_STANDARDS.md

@@ -152,62 +152,74 @@ rewritten to comply with these rules.
 1. Method names follow the *studlyCaps* (also referred to as *bumpy case* or
     *camel caps*) naming convention, with care taken to minimize the letter
     count. The initial letter of the name is lowercase, and each letter that
-    starts a new `word` is capitalized:
+    starts a new "word" is capitalized.
 
-    Good:
+1. Class names should be descriptive nouns in *PascalCase* and as short as
+    possible. Each word in the class name should start with a capital letter,
+    without underscore delimiters. The class name should be prefixed with the
+    name of the "parent set" (e.g. the name of the extension) if no namespaces
+    are used.
+
+1.  Abbreviations and acronyms as well as initialisms should be avoided wherever
+    possible, unless they are much more widely used than the long form (e.g. HTTP
+    or URL). Abbreviations, acronyms, and initialisms should be treated like
+    regular words, thus they should be written with an uppercase first character,
+    followed by lowercase characters.
+
+1.  Diverging from this policy is allowed to keep internal consistency within a
+    single extension, if the name follows an established, language-agnostic
+    standard, or for other reasons, if those reasons are properly justified
+    and voted on as part of the RFC process.
+
+
+    Good method names:
 
     ```php
     connect()
     getData()
     buildSomeWidget()
+    performHttpRequest()
     ```
 
-    Bad:
+    Bad method names:
 
     ```php
     get_Data()
     buildsomewidget()
     getI()
+    performHTTPRequest()
     ```
 
-1. Class names should be descriptive nouns in *PascalCase* and as short as
-    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters. The class name should be prefixed with the
-    name of the "parent set" (e.g. the name of the extension) if no namespaces
-    are used. Abbreviations and acronyms as well as initialisms should be
-    avoided wherever possible, unless they are much more widely used than the
-    long form (e.g. HTTP or URL). Abbreviations start with a capital letter
-    followed by lowercase letters, whereas acronyms and initialisms are written
-    according to their standard notation. Usage of acronyms and initialisms is
-    not allowed if they are not widely adopted and recognized as such.
-
-    Good:
+    Good class names:
 
     ```php
     Curl
     CurlResponse
-    HTTPStatusCode
-    URL
-    BTreeMap // B-tree Map
-    Id // Identifier
-    ID // Identity Document
+    HttpStatusCode
+    Url
+    BtreeMap // B-tree Map
+    UserId // User Identifier
     Char // Character
     Intl // Internationalization
-    Radar // Radio Detecting and Ranging
+    Ssl\Certificate
+    Ssl\Crl // Certificate Revocation List
+    Ssl\CrlUrl
     ```
 
-    Bad:
+    Bad class names:
 
     ```php
     curl
     curl_response
-    HttpStatusCode
-    Url
-    BtreeMap
-    ID // Identifier
+    HTTPStatusCode
+    URL
+    BTreeMap
+    UserID // User Identifier
     CHAR
     INTL
-    RADAR // Radio Detecting and Ranging
+    SSL\Certificate
+    SSL\CRL
+    SSL\CRLURL
     ```
 
 ## Internal function naming conventions

UPGRADING

@@ -142,6 +142,9 @@ PHP 8.4 UPGRADE NOTES
   . SoapClient::$sdl is now a Soap\Sdl object rather than a resource.
     Checks using is_resource() (i.e. is_resource($client->sdl)) should be
     replaced with checks for null (i.e. $client->sdl !== null).
+  . SoapClient::$typemap is now an array rather than a resource.
+    Checks using is_resource() (i.e. is_resource($client->typemap)) should be
+    replaced with checks for null (i.e. $client->typemap !== null).
 
 - SPL:
   . Out of bounds accesses in SplFixedArray now throw an exception of type

ext/bcmath/bcmath.c

@@ -29,6 +29,16 @@
 #include "php_bcmath.h"
 #include "libbcmath/src/bcmath.h"
 
+/* Always pair SETUP with TEARDOWN, and do so in the outer scope!
+ * Should not be used when data can escape the function. */
+#define BC_ARENA_SETUP \
+	char bc_arena[BC_ARENA_SIZE]; \
+	BCG(arena) = bc_arena;
+
+#define BC_ARENA_TEARDOWN \
+	BCG(arena) = NULL; \
+	BCG(arena_offset) = 0;
+
 ZEND_DECLARE_MODULE_GLOBALS(bcmath)
 static PHP_GINIT_FUNCTION(bcmath);
 static PHP_GSHUTDOWN_FUNCTION(bcmath);
@@ -89,6 +99,8 @@ static PHP_GINIT_FUNCTION(bcmath)
 	ZEND_TSRMLS_CACHE_UPDATE();
 #endif
 	bcmath_globals->bc_precision = 0;
+	bcmath_globals->arena = NULL;
+	bcmath_globals->arena_offset = 0;
 	bc_init_numbers();
 }
 /* }}} */
@@ -99,6 +111,8 @@ static PHP_GSHUTDOWN_FUNCTION(bcmath)
 	_bc_free_num_ex(&bcmath_globals->_zero_, 1);
 	_bc_free_num_ex(&bcmath_globals->_one_, 1);
 	_bc_free_num_ex(&bcmath_globals->_two_, 1);
+	bcmath_globals->arena = NULL;
+	bcmath_globals->arena_offset = 0;
 }
 /* }}} */
 
@@ -167,6 +181,8 @@ PHP_FUNCTION(bcadd)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	if (php_str2num(&first, left) == FAILURE) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
@@ -185,6 +201,7 @@ PHP_FUNCTION(bcadd)
 		bc_free_num(&first);
 		bc_free_num(&second);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -214,6 +231,8 @@ PHP_FUNCTION(bcsub)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	if (php_str2num(&first, left) == FAILURE) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
@@ -232,6 +251,7 @@ PHP_FUNCTION(bcsub)
 		bc_free_num(&first);
 		bc_free_num(&second);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -261,6 +281,8 @@ PHP_FUNCTION(bcmul)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	if (php_str2num(&first, left) == FAILURE) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
@@ -279,6 +301,7 @@ PHP_FUNCTION(bcmul)
 		bc_free_num(&first);
 		bc_free_num(&second);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -308,6 +331,8 @@ PHP_FUNCTION(bcdiv)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	bc_init_num(&result);
 
 	if (php_str2num(&first, left) == FAILURE) {
@@ -331,6 +356,7 @@ PHP_FUNCTION(bcdiv)
 		bc_free_num(&first);
 		bc_free_num(&second);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -360,6 +386,8 @@ PHP_FUNCTION(bcmod)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	bc_init_num(&result);
 
 	if (php_str2num(&first, left) == FAILURE) {
@@ -383,6 +411,7 @@ PHP_FUNCTION(bcmod)
 		bc_free_num(&first);
 		bc_free_num(&second);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -413,6 +442,8 @@ PHP_FUNCTION(bcpowmod)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	bc_init_num(&result);
 
 	if (php_str2num(&bc_base, base_str) == FAILURE) {
@@ -458,6 +489,7 @@ PHP_FUNCTION(bcpowmod)
 		bc_free_num(&bc_expo);
 		bc_free_num(&bc_modulus);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -487,6 +519,8 @@ PHP_FUNCTION(bcpow)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	bc_init_num(&result);
 
 	if (php_str2num(&first, base_str) == FAILURE) {
@@ -518,6 +552,7 @@ PHP_FUNCTION(bcpow)
 		bc_free_num(&first);
 		bc_free_num(&bc_exponent);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -546,6 +581,8 @@ PHP_FUNCTION(bcsqrt)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	if (php_str2num(&result, left) == FAILURE) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
@@ -559,6 +596,7 @@ PHP_FUNCTION(bcsqrt)
 
 	cleanup: {
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -588,6 +626,8 @@ PHP_FUNCTION(bccomp)
 		scale = (int) scale_param;
 	}
 
+	BC_ARENA_SETUP;
+
 	if (!bc_str2num(&first, ZSTR_VAL(left), ZSTR_VAL(left) + ZSTR_LEN(left), scale, false)) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
@@ -603,6 +643,7 @@ PHP_FUNCTION(bccomp)
 	cleanup: {
 		bc_free_num(&first);
 		bc_free_num(&second);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -617,6 +658,8 @@ static void bcfloor_or_bcceil(INTERNAL_FUNCTION_PARAMETERS, bool is_floor)
 		Z_PARAM_STR(numstr)
 	ZEND_PARSE_PARAMETERS_END();
 
+	BC_ARENA_SETUP;
+
 	if (php_str2num(&num, numstr) == FAILURE) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
@@ -628,6 +671,7 @@ static void bcfloor_or_bcceil(INTERNAL_FUNCTION_PARAMETERS, bool is_floor)
 	cleanup: {
 		bc_free_num(&num);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */
@@ -676,6 +720,8 @@ PHP_FUNCTION(bcround)
 			return;
 	}
 
+	BC_ARENA_SETUP;
+
 	bc_init_num(&result);
 
 	if (php_str2num(&num, numstr) == FAILURE) {
@@ -689,6 +735,7 @@ PHP_FUNCTION(bcround)
 	cleanup: {
 		bc_free_num(&num);
 		bc_free_num(&result);
+		BC_ARENA_TEARDOWN;
 	};
 }
 /* }}} */