Move weakref key to zend_object* conversions to zend_weakrefs.h

Make it public for any extensions that need to work with EG(weakrefs)
for instrumentation, debugging, etc.

PHP 8.1 and below would use the raw pointer value instead.

Author: TysonAndre

Zend/zend_weakrefs.c

@@ -52,26 +52,6 @@ typedef struct _zend_weakmap_iterator {
 #define ZEND_WEAKREF_GET_PTR(p) ((void *) (((uintptr_t) (p)) & ~3))
 #define ZEND_WEAKREF_ENCODE(p, t) ((void *) (((uintptr_t) (p)) | (t)))
 
-/* Because php uses the raw numbers as a hash function, raw pointers will lead to hash collisions.
- * We have a guarantee that the lowest ZEND_MM_ALIGNED_OFFSET_LOG2 bits of a pointer are zero.
- *
- * E.g. On most 64-bit platforms, pointers are aligned to 8 bytes, so the least significant 3 bits are always 0 and can be discarded.
- *
- * NOTE: This function is only used for EG(weakrefs) and zend_weakmap->ht.
- * It is not used for the HashTable instances associated with ZEND_WEAKREF_TAG_HT tags (created in zend_weakref_register, which uses ZEND_WEAKREF_ENCODE instead).
- * The ZEND_WEAKREF_TAG_HT instances are used to disambiguate between multiple weak references to the same zend_object.
- */
-static zend_always_inline zend_ulong zend_object_ptr_to_weakref_key(const zend_object *object)
-{
-	ZEND_ASSERT(((uintptr_t)object) % ZEND_MM_ALIGNMENT == 0);
-	return ((uintptr_t) object) >> ZEND_MM_ALIGNMENT_LOG2;
-}
-
-static zend_always_inline zend_object *zend_weakref_key_to_zend_object_ptr(zend_ulong key)
-{
-	return (zend_object *) (((uintptr_t) key) << ZEND_MM_ALIGNMENT_LOG2);
-}
-
 zend_class_entry *zend_ce_weakref;
 zend_class_entry *zend_ce_weakmap;
 static zend_object_handlers zend_weakref_handlers;

Zend/zend_weakrefs.h

@@ -17,6 +17,8 @@
 #ifndef ZEND_WEAKREFS_H
 #define ZEND_WEAKREFS_H
 
+#include "zend_alloc.h"
+
 BEGIN_EXTERN_C()
 
 extern ZEND_API zend_class_entry *zend_ce_weakref;
@@ -40,6 +42,26 @@ static zend_always_inline void *zend_weakrefs_hash_add_ptr(HashTable *ht, zend_o
 	}
 }
 
+/* Because php uses the raw numbers as a hash function, raw pointers will lead to hash collisions.
+ * We have a guarantee that the lowest ZEND_MM_ALIGNED_OFFSET_LOG2 bits of a pointer are zero.
+ *
+ * E.g. On most 64-bit platforms, pointers are aligned to 8 bytes, so the least significant 3 bits are always 0 and can be discarded.
+ *
+ * NOTE: This function is only used for EG(weakrefs) and zend_weakmap->ht.
+ * It is not used for the HashTable instances associated with ZEND_WEAKREF_TAG_HT tags (created in zend_weakref_register, which uses ZEND_WEAKREF_ENCODE instead).
+ * The ZEND_WEAKREF_TAG_HT instances are used to disambiguate between multiple weak references to the same zend_object.
+ */
+static zend_always_inline zend_ulong zend_object_ptr_to_weakref_key(const zend_object *object)
+{
+	ZEND_ASSERT(((uintptr_t)object) % ZEND_MM_ALIGNMENT == 0);
+	return ((uintptr_t) object) >> ZEND_MM_ALIGNMENT_LOG2;
+}
+
+static zend_always_inline zend_object *zend_weakref_key_to_zend_object_ptr(zend_ulong key)
+{
+	return (zend_object *) (((uintptr_t) key) << ZEND_MM_ALIGNMENT_LOG2);
+}
+
 END_EXTERN_C()
 
 #endif

travis/compile.sh

@@ -1,29 +1,8 @@
 #!/bin/bash
-set -ex
-if [[ "$ENABLE_ZTS" == 1 ]]; then
-	TS="--enable-zts";
-else
-	TS="";
-fi
-if [[ "$ENABLE_DEBUG" == 1 ]]; then
-	DEBUG="--enable-debug";
-else
-	DEBUG="";
-fi
-if [[ "$S390X" == 1 ]]; then
-	S390X_CONFIG="--without-pcre-jit";
-else
-	S390X_CONFIG="";
-fi
 
 ./buildconf --force
 ./configure \
---enable-option-checking=fatal \
---prefix="$HOME"/php-install \
-$CONFIG_QUIET \
-$DEBUG \
-$TS \
-$S390X_CONFIG \
+--prefix=/home/tyson/php-8.2.0-weakmap-second-optimization \
 --enable-phpdbg \
 --enable-fpm \
 --with-pdo-mysql=mysqlnd \
@@ -32,10 +11,9 @@ $S390X_CONFIG \
 --with-pdo-pgsql \
 --with-pdo-sqlite \
 --enable-intl \
---without-pear \
+--with-pear \
 --enable-gd \
 --with-jpeg \
---with-webp \
 --with-freetype \
 --with-xpm \
 --enable-exif \
@@ -63,16 +41,9 @@ $S390X_CONFIG \
 --enable-ftp \
 --with-pspell=/usr \
 --with-enchant=/usr \
---with-kerberos \
 --enable-sysvmsg \
 --with-ffi \
---with-sodium \
---enable-zend-test=shared \
---enable-werror \
---with-pear
+--enable-zend-test=shared
 
-if [[ -z "$CONFIG_ONLY" ]]; then
-	MAKE_JOBS=${MAKE_JOBS:-$(nproc)}
-	make "-j${MAKE_JOBS}" $MAKE_QUIET
-	make install
-fi
+make -j9 | tee my_compile.log
+make install