Merge branch 'PHP-7.4'

dstogov · dstogov · commit 128318dcbf99 · 2019-03-28T03:01:58.000+03:00
* PHP-7.4:
  Support for __restrict and few GCC attributes
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
@@ -5907,6 +5907,12 @@ void zend_ffi_add_attribute(zend_ffi_dcl *dcl, const char *name, size_t name_len
 		/* ignore */
 	} else if (name_len == sizeof("deprecated")-1 && memcmp(name, "deprecated", sizeof("deprecated")-1) == 0) {
 		/* ignore */
+	} else if (name_len == sizeof("__nothrow__")-1 && memcmp(name, "__nothrow__", sizeof("__nothrow__")-1) == 0) {
+		/* ignore */
+	} else if (name_len == sizeof("__leaf__")-1 && memcmp(name, "__leaf__", sizeof("__leaf__")-1) == 0) {
+		/* ignore */
+	} else if (name_len == sizeof("__malloc__")-1 && memcmp(name, "__malloc__", sizeof("__malloc__")-1) == 0) {
+		/* ignore */
 	} else {
 		zend_ffi_parser_error("unsupported attribute '%.*s' at line %d", name_len, name, FFI_G(line));
 	}
diff --git a/ext/ffi/ffi.g b/ext/ffi/ffi.g
@@ -158,7 +158,7 @@ type_qualifier(zend_ffi_dcl *dcl):
 		("const"|"__const"|"__const__")
 		{dcl->flags |= ZEND_FFI_DCL_CONST;}
 		{dcl->attr |= ZEND_FFI_ATTR_CONST;}
-	|	("restrict"|"__restict"|"__restrict__")
+	|	("restrict"|"__restrict"|"__restrict__")
 		{dcl->flags |= ZEND_FFI_DCL_RESTRICT;}
 	|	("volatile"|"__volatile"|"__volatile__")
 		{dcl->flags |= ZEND_FFI_DCL_VOLATILE;}
diff --git a/ext/ffi/ffi_parser.c b/ext/ffi/ffi_parser.c
