Move ARM64 build to Cirrus

iluuu1994 · iluuu1994 · commit 7d881055b704 · 2023-03-06T23:09:47.000+01:00
Travis is very unreliable lately
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -26,3 +26,196 @@ task:
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
     - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
+
+arm_task:
+  name: ARM_DEBUG_NTS
+  arm_container:
+    image: gcc:latest
+    additional_containers:
+      - name: mysql
+        image: mysql:latest
+        port: 3306
+        env:
+          MYSQL_ROOT_PASSWORD: "root"
+          MYSQL_DATABASE: "test"
+      - name: postgres
+        image: postgres:latest
+        port: 5432
+        env:
+          POSTGRES_PASSWORD: "postgres"
+          POSTGRES_DB: "test"
+  install_script:
+    - apt-get update -y
+    - >-
+        apt-get install -y
+        bison
+        re2c
+        locales
+        locales-all
+        `#ldap-utils`
+        openssl
+        `slapd`
+        libgmp-dev
+        libicu-dev
+        `#libtidy-dev`
+        `#libenchant-dev`
+        libaspell-dev
+        libpspell-dev
+        libsasl2-dev
+        libxpm-dev
+        libzip-dev
+        `#libsqlite3-dev`
+        libwebp-dev
+        libonig-dev
+        libkrb5-dev
+        libgssapi-krb5-2
+        libcurl4-openssl-dev
+        libxml2-dev
+        libxslt1-dev
+        libpq-dev
+        libreadline-dev
+        `#libldap2-dev`
+        libsodium-dev
+        libargon2-0-dev
+        libmm-dev
+        `#libsnmp-dev`
+        `#postgresql`
+        `#postgresql-contrib`
+        `#snmpd`
+        `#snmp-mibs-downloader`
+        `#freetds-dev`
+        `#unixodbc-dev`
+        libc-client-dev
+        dovecot-core
+        dovecot-pop3d
+        dovecot-imapd
+        `#sendmail`
+        `#firebird-dev`
+        liblmdb-dev
+        libtokyocabinet-dev
+        libdb-dev
+        libqdbm-dev
+        libjpeg-dev
+        libpng-dev
+        libfreetype6-dev
+  build_script:
+    - ./buildconf -f
+    - >-
+        ./configure
+        --enable-debug
+        --enable-zts
+        --enable-option-checking=fatal
+        --prefix=/usr
+        --enable-phpdbg
+        --enable-fpm
+        --enable-opcache
+        --with-pdo-mysql=mysqlnd
+        --with-mysqli=mysqlnd
+        --with-pgsql
+        --with-pdo-pgsql
+        --with-pdo-sqlite
+        --enable-intl
+        --without-pear
+        --enable-gd
+        --with-jpeg
+        --with-webp
+        --with-freetype
+        --with-xpm
+        --enable-exif
+        --with-zip
+        --with-zlib
+        --with-zlib-dir=/usr
+        --enable-soap
+        --enable-xmlreader
+        --with-xsl
+        `#--with-tidy`
+        --enable-sysvsem
+        --enable-sysvshm
+        --enable-shmop
+        --enable-pcntl
+        --with-readline
+        --enable-mbstring
+        --with-curl
+        --with-gettext
+        --enable-sockets
+        --with-bz2
+        --with-openssl
+        --with-gmp
+        --enable-bcmath
+        --enable-calendar
+        --enable-ftp
+        --with-pspell=/usr
+        `#--with-enchant=/usr`
+        --with-kerberos
+        --enable-sysvmsg
+        --with-ffi
+        --enable-zend-test
+        `#--enable-dl-test=shared`
+        `#--with-ldap`
+        `#--with-ldap-sasl`
+        --with-password-argon2
+        --with-mhash
+        --with-sodium
+        --enable-dba
+        --with-cdb
+        --enable-flatfile
+        --enable-inifile
+        --with-tcadb
+        --with-lmdb
+        --with-qdbm
+        `#--with-snmp`
+        `#--with-unixODBC`
+        `#--with-imap`
+        --with-kerberos
+        --with-imap-ssl
+        `#--with-pdo-odbc=unixODBC,/usr`
+        `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient`
+        `#--with-oci8=shared,instantclient,/opt/oracle/instantclient`
+        --with-config-file-path=/etc
+        --with-config-file-scan-dir=/etc/php.d
+        `#--with-pdo-firebird`
+        `#--with-pdo-dblib`
+        `#--enable-werror`
+    - make -j$(/usr/bin/nproc)
+    - make install
+    - mkdir -p /etc/php.d
+    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+    # Specify opcache.preload_user as we're running as root.
+    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+  tests_script:
+    - export SKIP_IO_CAPTURE_TESTS=1
+    - export CI_NO_IPV6=1
+    - export MYSQL_TEST_HOST=mysql
+    - export MYSQL_TEST_USER=root
+    - export MYSQL_TEST_PASSWD=root
+    - export PDO_MYSQL_TEST_DSN="mysql:host=mysql;dbname=test"
+    - export PDO_MYSQL_TEST_USER=root
+    - export PDO_MYSQL_TEST_PASS=root
+    - export PDO_PGSQL_TEST_DSN="pgsql:host=postgres port=5432 dbname=test user=postgres password=postgres"
+    - >-
+        sapi/cli/php run-tests.php
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        -d opcache.jit_buffer_size=16M
+        -d opcache.jit=function
+        -P -q -x -j$(/usr/bin/nproc)
+        -g FAIL,BORK,LEAK,XLEAK
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+        --repeat 2
+    - >-
+        sapi/cli/php run-tests.php
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        -d opcache.jit_buffer_size=16M
+        -d opcache.jit=tracing
+        -P -q -x -j2
+        -g FAIL,BORK,LEAK,XLEAK
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+        --repeat 2
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -22,6 +22,7 @@ env:
   CXX: ccache g++
 jobs:
   LINUX_X64:
+    if: false
     strategy:
       fail-fast: false
       matrix:
@@ -73,6 +74,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   LINUX_X32:
+    if: false
     name: LINUX_X32_DEBUG_ZTS
     runs-on: ubuntu-latest
     container:
@@ -119,6 +121,7 @@ jobs:
             -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
   MACOS_DEBUG_NTS:
+    if: false
     runs-on: macos-11
     steps:
       - name: git checkout
@@ -153,6 +156,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   WINDOWS:
+    if: false
     strategy:
       fail-fast: false
       matrix:
diff --git a/.travis.yml b/.travis.yml
@@ -68,8 +68,6 @@ env:
 
 jobs:
     include:
-        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 ARM64=1
-          arch: arm64
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 S390X=1
           arch: s390x
 
@@ -88,8 +86,6 @@ before_script:
 # Run PHPs run-tests.php
 script:
     - ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing
-    - if [[ "$ARM64" == 1 ]]; then ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=function; fi
-    - if [[ "$ARM64" == 1 ]]; then ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing --repeat 2; fi
     - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
 
 after_success:
diff --git a/ext/opcache/jit/dynasm/dasm_arm64.h b/ext/opcache/jit/dynasm/dasm_arm64.h
@@ -83,6 +83,9 @@ struct dasm_State {
 /* The size of the core structure depends on the max. number of sections. */
 #define DASM_PSZ(ms)	(sizeof(dasm_State)+(ms-1)*sizeof(dasm_Section))
 
+/* Perform potentially overflowing pointer operations in a way that avoids UB. */
+#define DASM_PTR_SUB(p1, off) ((void *) ((uintptr_t) (p1) - sizeof(*p1) * (uintptr_t) (off)))
+#define DASM_PTR_ADD(p1, off) ((void *) ((uintptr_t) (p1) + sizeof(*p1) * (uintptr_t) (off)))
 
 /* Initialize DynASM state. */
 void dasm_init(Dst_DECL, int maxsection)
@@ -102,7 +105,7 @@ void dasm_init(Dst_DECL, int maxsection)
   D->maxsection = maxsection;
   for (i = 0; i < maxsection; i++) {
     D->sections[i].buf = NULL;  /* Need this for pass3. */
-    D->sections[i].rbuf = D->sections[i].buf - DASM_SEC2POS(i);
+    D->sections[i].rbuf = DASM_PTR_SUB(D->sections[i].buf, DASM_SEC2POS(i));
     D->sections[i].bsize = 0;
     D->sections[i].epos = 0;  /* Wrong, but is recalculated after resize. */
   }
@@ -432,7 +435,7 @@ int dasm_encode(Dst_DECL, void *buffer)
   for (secnum = 0; secnum < D->maxsection; secnum++) {
     dasm_Section *sec = D->sections + secnum;
     int *b = sec->buf;
-    int *endb = sec->rbuf + sec->pos;
+    int *endb = DASM_PTR_ADD(sec->rbuf, sec->pos);
 
     while (b != endb) {
       dasm_ActList p = D->actionlist + *b++;
@@ -466,10 +469,10 @@ int dasm_encode(Dst_DECL, void *buffer)
 	    cp[-1] |= ((n >> 2) & 0x03ffffff);
 	  } else if ((ins & 0x800)) {  /* B.cond, CBZ, CBNZ, LDR* literal */
 	    CK_REL((n & 3) == 0 && ((n+0x00100000) >> 21) == 0, n);
-	    cp[-1] |= ((n << 3) & 0x00ffffe0);
+	    cp[-1] |= ((int)((unsigned int)n << 3) & 0x00ffffe0);
 	  } else if ((ins & 0x3000) == 0x2000) {  /* ADR */
 	    CK_REL(((n+0x00100000) >> 21) == 0, n);
-	    cp[-1] |= ((n << 3) & 0x00ffffe0) | ((n & 3) << 29);
+	    cp[-1] |= ((int)((unsigned int)n << 3) & 0x00ffffe0) | ((n & 3) << 29);
 	  } else if ((ins & 0x3000) == 0x3000) {  /* ADRP */
 	    cp[-1] |= ((n >> 9) & 0x00ffffe0) | (((n >> 12) & 3) << 29);
 	  } else if ((ins & 0x1000)) {  /* TBZ, TBNZ */
