Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:3998 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 79998 invoked from network); 15 Aug 2003 20:01:32 -0000 Received: from unknown (HELO bm5.mail.tds.net) (216.170.230.85) by pb1.pair.com with SMTP; 15 Aug 2003 20:01:32 -0000 Received: from halcyon.workpc.tds.net ([204.246.8.151]) by bm5.mail.tds.net with ESMTP id <20030815200131.JLFM619.bm5@halcyon.workpc.tds.net>; Fri, 15 Aug 2003 15:01:31 -0500 To: internals@lists.php.net Cc: andi@zend.com Content-Type: multipart/mixed; boundary="=-u3+5J5HjsKQd8m7Y9JEt" Organization: Message-ID: <1060977691.11746.3.camel@halcyon.workpc.tds.net> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 15 Aug 2003 15:01:31 -0500 Subject: [PATCH] inline -> static inline From: jason@inetgurus.net (Jason Greene) --=-u3+5J5HjsKQd8m7Y9JEt Content-Type: text/plain Content-Transfer-Encoding: 7bit Apparently there seems to be a bug in SUNs compiler when a static inline function calls a inline function. This simple patch fixes the problem. I would have applied it myself, but I must have lost karma due to the cvs reorgs -Jason -- Jason Greene --=-u3+5J5HjsKQd8m7Y9JEt Content-Disposition: attachment; filename=static_inline.patch Content-Type: text/plain; name=static_inline.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit ? static_inline.patch Index: zend_execute.c =================================================================== RCS file: /repository/ZendEngine2/zend_execute.c,v retrieving revision 1.519 diff -u -r1.519 zend_execute.c --- zend_execute.c 4 Aug 2003 19:57:53 -0000 1.519 +++ zend_execute.c 15 Aug 2003 19:58:06 -0000 @@ -1562,7 +1562,7 @@ } -inline int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS) { zval **var_ptr; zval *value; @@ -1722,7 +1722,7 @@ } -inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) { zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); int (*incdec_op)(zval *op1) = incdec_op_arg; @@ -2779,7 +2779,7 @@ } -inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *varptr; varptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -2934,7 +2934,7 @@ } -inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *nest_levels_zval = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); zval tmp; @@ -3152,7 +3152,7 @@ } -inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *array_ptr = &EX_T(EX(opline)->result.u.var).tmp_var; zval *expr_ptr, **expr_ptr_ptr = NULL; Index: zend_object_handlers.c =================================================================== RCS file: /repository/ZendEngine2/zend_object_handlers.c,v retrieving revision 1.63 diff -u -r1.63 zend_object_handlers.c --- zend_object_handlers.c 3 Aug 2003 17:40:44 -0000 1.63 +++ zend_object_handlers.c 15 Aug 2003 19:58:06 -0000 @@ -154,7 +154,7 @@ } -inline int zend_verify_property_access(zend_property_info *property_info, zend_class_entry *ce TSRMLS_DC) +static inline int zend_verify_property_access(zend_property_info *property_info, zend_class_entry *ce TSRMLS_DC) { switch (property_info->flags & ZEND_ACC_PPP_MASK) { case ZEND_ACC_PUBLIC: --=-u3+5J5HjsKQd8m7Y9JEt--