diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c
index 8851764f573..81e3f43c51f 100644
--- a/Zend/zend_cpuinfo.c
+++ b/Zend/zend_cpuinfo.c
@@ -99,6 +99,7 @@ void zend_cpu_startup(void)
 }
 
 ZEND_API int zend_cpu_supports(zend_cpu_feature feature) {
+	ZEND_ASSERT(cpuinfo.initialized);
 	if (feature & ZEND_CPU_EDX_MASK) {
 		return (cpuinfo.edx & (feature & ~ZEND_CPU_EDX_MASK));
 	} else if (feature & ZEND_CPU_EBX_MASK) {
diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h
index 0baec57c23a..8d08d0eb000 100644
--- a/Zend/zend_cpuinfo.h
+++ b/Zend/zend_cpuinfo.h
@@ -164,9 +164,9 @@ static zend_always_inline int zend_cpu_supports_sse42() {
 ZEND_NO_SANITIZE_ADDRESS
 static zend_always_inline int zend_cpu_supports_pclmul() {
 #if PHP_HAVE_BUILTIN_CPU_INIT
-        __builtin_cpu_init();
+	__builtin_cpu_init();
 #endif
-        return __builtin_cpu_supports("pclmul");
+	return __builtin_cpu_supports("pclmul");
 }
 #endif
 
@@ -208,7 +208,7 @@ static zend_always_inline int zend_cpu_supports_sse42() {
 }
 
 static zend_always_inline int zend_cpu_supports_pclmul() {
-        return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ);
+	return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ);
 }
 
 static zend_always_inline int zend_cpu_supports_avx() {