Skip to content

Commit 7a37fa2

Browse files
felipenspfelipensp
committed
- Revert ZEND_BEGIN_ARG_INFO change
1 parent d90dfe7 commit 7a37fa2

File tree

130 files changed

+2570
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+2570
-72
lines changed

‎Zend/zend_API.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef struct _zend_fcall_info_cache {
101101
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 },
102102
#define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, 1, allow_null, pass_by_ref, 0, 0 },
103103
#define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args) \
104-
const static zend_arg_info name[] = { \
104+
const zend_arg_info name[] = { \
105105
{ NULL, 0, NULL, 0, 0, 0, pass_rest_by_reference, return_reference, required_num_args },
106106
#define ZEND_BEGIN_ARG_INFO(name, pass_rest_by_reference) \
107107
ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, ZEND_RETURN_VALUE, -1)

‎Zend/zend_builtin_functions.c

+49
Original file line numberDiff line numberDiff line change
@@ -92,201 +92,250 @@ static ZEND_FUNCTION(gc_enable);
9292
static ZEND_FUNCTION(gc_disable);
9393

9494
/* {{{ arginfo */
95+
static
9596
ZEND_BEGIN_ARG_INFO(arginfo_zend_version, 0)
9697
ZEND_END_ARG_INFO()
9798

99+
static
98100
ZEND_BEGIN_ARG_INFO(arginfo_gc_collect_cycles, 0)
99101
ZEND_END_ARG_INFO()
100102

103+
static
101104
ZEND_BEGIN_ARG_INFO(arginfo_gc_enabled, 0)
102105
ZEND_END_ARG_INFO()
103106

107+
static
104108
ZEND_BEGIN_ARG_INFO(arginfo_gc_enable, 0)
105109
ZEND_END_ARG_INFO()
106110

111+
static
107112
ZEND_BEGIN_ARG_INFO(arginfo_gc_disable, 0)
108113
ZEND_END_ARG_INFO()
109114

115+
static
110116
ZEND_BEGIN_ARG_INFO(arginfo_func_num_args, 0)
111117
ZEND_END_ARG_INFO()
112118

119+
static
113120
ZEND_BEGIN_ARG_INFO_EX(arginfo_func_get_arg, 0, 0, 1)
114121
ZEND_ARG_INFO(0, arg_num)
115122
ZEND_END_ARG_INFO()
116123

124+
static
117125
ZEND_BEGIN_ARG_INFO(arginfo_func_get_args, 0)
118126
ZEND_END_ARG_INFO()
119127

128+
static
120129
ZEND_BEGIN_ARG_INFO_EX(arginfo_strlen, 0, 0, 1)
121130
ZEND_ARG_INFO(0, str)
122131
ZEND_END_ARG_INFO()
123132

133+
static
124134
ZEND_BEGIN_ARG_INFO_EX(arginfo_strcmp, 0, 0, 2)
125135
ZEND_ARG_INFO(0, str1)
126136
ZEND_ARG_INFO(0, str2)
127137
ZEND_END_ARG_INFO()
128138

139+
static
129140
ZEND_BEGIN_ARG_INFO_EX(arginfo_strncmp, 0, 0, 3)
130141
ZEND_ARG_INFO(0, str1)
131142
ZEND_ARG_INFO(0, str2)
132143
ZEND_ARG_INFO(0, len)
133144
ZEND_END_ARG_INFO()
134145

146+
static
135147
ZEND_BEGIN_ARG_INFO_EX(arginfo_strcasecmp, 0, 0, 2)
136148
ZEND_ARG_INFO(0, str1)
137149
ZEND_ARG_INFO(0, str2)
138150
ZEND_END_ARG_INFO()
139151

152+
static
140153
ZEND_BEGIN_ARG_INFO_EX(arginfo_strncasecmp, 0, 0, 3)
141154
ZEND_ARG_INFO(0, str1)
142155
ZEND_ARG_INFO(0, str2)
143156
ZEND_ARG_INFO(0, len)
144157
ZEND_END_ARG_INFO()
145158

159+
static
146160
ZEND_BEGIN_ARG_INFO_EX(arginfo_each, 0, 0, 1)
147161
ZEND_ARG_INFO(1, arr)
148162
ZEND_END_ARG_INFO()
149163

164+
static
150165
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_reporting, 0, 0, 1)
151166
ZEND_ARG_INFO(0, new_error_level)
152167
ZEND_END_ARG_INFO()
153168

169+
static
154170
ZEND_BEGIN_ARG_INFO_EX(arginfo_define, 0, 0, 3)
155171
ZEND_ARG_INFO(0, constant_name)
156172
ZEND_ARG_INFO(0, value)
157173
ZEND_ARG_INFO(0, case_insensitive)
158174
ZEND_END_ARG_INFO()
159175

176+
static
160177
ZEND_BEGIN_ARG_INFO_EX(arginfo_defined, 0, 0, 1)
161178
ZEND_ARG_INFO(0, constant_name)
162179
ZEND_END_ARG_INFO()
163180

181+
static
164182
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class, 0, 0, 0)
165183
ZEND_ARG_INFO(0, object)
166184
ZEND_END_ARG_INFO()
167185

186+
static
168187
ZEND_BEGIN_ARG_INFO(arginfo_get_called_class, 0)
169188
ZEND_END_ARG_INFO()
170189

190+
static
171191
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_parent_class, 0, 0, 0)
172192
ZEND_ARG_INFO(0, object)
173193
ZEND_END_ARG_INFO()
174194

195+
static
175196
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2)
176197
ZEND_ARG_INFO(0, object)
177198
ZEND_ARG_INFO(0, class_name)
178199
ZEND_END_ARG_INFO()
179200

201+
static
180202
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_a, 0, 0, 2)
181203
ZEND_ARG_INFO(0, object)
182204
ZEND_ARG_INFO(0, class_name)
183205
ZEND_END_ARG_INFO()
184206

207+
static
185208
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 1)
186209
ZEND_ARG_INFO(0, class_name)
187210
ZEND_END_ARG_INFO()
188211

212+
static
189213
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_object_vars, 0, 0, 1)
190214
ZEND_ARG_INFO(0, obj)
191215
ZEND_END_ARG_INFO()
192216

217+
static
193218
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_methods, 0, 0, 1)
194219
ZEND_ARG_INFO(0, class)
195220
ZEND_END_ARG_INFO()
196221

222+
static
197223
ZEND_BEGIN_ARG_INFO_EX(arginfo_method_exists, 0, 0, 2)
198224
ZEND_ARG_INFO(0, object)
199225
ZEND_ARG_INFO(0, method)
200226
ZEND_END_ARG_INFO()
201227

228+
static
202229
ZEND_BEGIN_ARG_INFO_EX(arginfo_property_exists, 0, 0, 2)
203230
ZEND_ARG_INFO(0, object_or_class)
204231
ZEND_ARG_INFO(0, property_name)
205232
ZEND_END_ARG_INFO()
206233

234+
static
207235
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_exists, 0, 0, 1)
208236
ZEND_ARG_INFO(0, classname)
209237
ZEND_ARG_INFO(0, autoload)
210238
ZEND_END_ARG_INFO()
211239

240+
static
212241
ZEND_BEGIN_ARG_INFO_EX(arginfo_interface_exists, 0, 0, 1)
213242
ZEND_ARG_INFO(0, classname)
214243
ZEND_ARG_INFO(0, autoload)
215244
ZEND_END_ARG_INFO()
216245

246+
static
217247
ZEND_BEGIN_ARG_INFO_EX(arginfo_function_exists, 0, 0, 1)
218248
ZEND_ARG_INFO(0, function_name)
219249
ZEND_END_ARG_INFO()
220250

251+
static
221252
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_alias, 0, 0, 2)
222253
ZEND_ARG_INFO(0, user_class_name)
223254
ZEND_ARG_INFO(0, alias_name)
224255
ZEND_ARG_INFO(0, autoload)
225256
ZEND_END_ARG_INFO()
226257

258+
static
227259
ZEND_BEGIN_ARG_INFO(arginfo_get_included_files, 0)
228260
ZEND_END_ARG_INFO()
229261

262+
static
230263
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
231264
ZEND_ARG_INFO(0, messsage)
232265
ZEND_ARG_INFO(0, error_type)
233266
ZEND_END_ARG_INFO()
234267

268+
static
235269
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1)
236270
ZEND_ARG_INFO(0, error_handler)
237271
ZEND_ARG_INFO(0, error_types)
238272
ZEND_END_ARG_INFO()
239273

274+
static
240275
ZEND_BEGIN_ARG_INFO(arginfo_restore_error_handler, 0)
241276
ZEND_END_ARG_INFO()
242277

278+
static
243279
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
244280
ZEND_ARG_INFO(0, exception_handler)
245281
ZEND_END_ARG_INFO()
246282

283+
static
247284
ZEND_BEGIN_ARG_INFO(arginfo_restore_exception_handler, 0)
248285
ZEND_END_ARG_INFO()
249286

287+
static
250288
ZEND_BEGIN_ARG_INFO(arginfo_get_declared_classes, 0)
251289
ZEND_END_ARG_INFO()
252290

291+
static
253292
ZEND_BEGIN_ARG_INFO(arginfo_get_declared_interfaces, 0)
254293
ZEND_END_ARG_INFO()
255294

295+
static
256296
ZEND_BEGIN_ARG_INFO(arginfo_get_defined_functions, 0)
257297
ZEND_END_ARG_INFO()
258298

299+
static
259300
ZEND_BEGIN_ARG_INFO(arginfo_get_defined_vars, 0)
260301
ZEND_END_ARG_INFO()
261302

303+
static
262304
ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
263305
ZEND_ARG_INFO(0, args)
264306
ZEND_ARG_INFO(0, code)
265307
ZEND_END_ARG_INFO()
266308

309+
static
267310
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_resource_type, 0, 0, 1)
268311
ZEND_ARG_INFO(0, res)
269312
ZEND_END_ARG_INFO()
270313

314+
static
271315
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_loaded_extensions, 0, 0, 0)
272316
ZEND_ARG_INFO(0, zend_extensions)
273317
ZEND_END_ARG_INFO()
274318

319+
static
275320
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_constants, 0, 0, 0)
276321
ZEND_ARG_INFO(0, categorize)
277322
ZEND_END_ARG_INFO()
278323

324+
static
279325
ZEND_BEGIN_ARG_INFO(arginfo_debug_print_backtrace, 0)
280326
ZEND_END_ARG_INFO()
281327

328+
static
282329
ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_backtrace, 0, 0, 0)
283330
ZEND_ARG_INFO(0, provide_object)
284331
ZEND_END_ARG_INFO()
285332

333+
static
286334
ZEND_BEGIN_ARG_INFO_EX(arginfo_extension_loaded, 0, 0, 1)
287335
ZEND_ARG_INFO(0, extension_name)
288336
ZEND_END_ARG_INFO()
289337

338+
static
290339
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_extension_funcs, 0, 0, 1)
291340
ZEND_ARG_INFO(0, extension_name)
292341
ZEND_END_ARG_INFO()

‎Zend/zend_exceptions.c

+2
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@ ZEND_METHOD(exception, __toString)
605605
* And never try to change the state of exceptions and never implement anything
606606
* that gives the user anything to accomplish this.
607607
*/
608+
static
608609
ZEND_BEGIN_ARG_INFO_EX(arginfo_exception___construct, 0, 0, 0)
609610
ZEND_ARG_INFO(0, message)
610611
ZEND_ARG_INFO(0, code)
@@ -625,6 +626,7 @@ const static zend_function_entry default_exception_functions[] = {
625626
{NULL, NULL, NULL}
626627
};
627628

629+
static
628630
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_exception___construct, 0, 0, 0)
629631
ZEND_ARG_INFO(0, message)
630632
ZEND_ARG_INFO(0, code)

‎Zend/zend_interfaces.c

+4
Original file line numberDiff line numberDiff line change
@@ -498,14 +498,17 @@ const zend_function_entry zend_funcs_iterator[] = {
498498

499499
const zend_function_entry *zend_funcs_traversable = NULL;
500500

501+
static
501502
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1)
502503
ZEND_ARG_INFO(0, offset)
503504
ZEND_END_ARG_INFO()
504505

506+
static
505507
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_get, 0, 0, 1) /* actually this should be return by ref but atm cannot be */
506508
ZEND_ARG_INFO(0, offset)
507509
ZEND_END_ARG_INFO()
508510

511+
static
509512
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2)
510513
ZEND_ARG_INFO(0, offset)
511514
ZEND_ARG_INFO(0, value)
@@ -519,6 +522,7 @@ const zend_function_entry zend_funcs_arrayaccess[] = {
519522
{NULL, NULL, NULL}
520523
};
521524

525+
static
522526
ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0)
523527
ZEND_ARG_INFO(0, serialized)
524528
ZEND_END_ARG_INFO()

‎ext/bcmath/bcmath.c

+10
Original file line numberDiff line numberDiff line change
@@ -36,59 +36,69 @@ static PHP_GINIT_FUNCTION(bcmath);
3636
static PHP_GSHUTDOWN_FUNCTION(bcmath);
3737

3838
/* {{{ arginfo */
39+
static
3940
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcadd, 0, 0, 2)
4041
ZEND_ARG_INFO(0, left_operand)
4142
ZEND_ARG_INFO(0, right_operand)
4243
ZEND_ARG_INFO(0, scale)
4344
ZEND_END_ARG_INFO()
4445

46+
static
4547
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsub, 0, 0, 2)
4648
ZEND_ARG_INFO(0, left_operand)
4749
ZEND_ARG_INFO(0, right_operand)
4850
ZEND_ARG_INFO(0, scale)
4951
ZEND_END_ARG_INFO()
5052

53+
static
5154
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcmul, 0, 0, 2)
5255
ZEND_ARG_INFO(0, left_operand)
5356
ZEND_ARG_INFO(0, right_operand)
5457
ZEND_ARG_INFO(0, scale)
5558
ZEND_END_ARG_INFO()
5659

60+
static
5761
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcdiv, 0, 0, 2)
5862
ZEND_ARG_INFO(0, left_operand)
5963
ZEND_ARG_INFO(0, right_operand)
6064
ZEND_ARG_INFO(0, scale)
6165
ZEND_END_ARG_INFO()
6266

67+
static
6368
ZEND_BEGIN_ARG_INFO(arginfo_bcmod, 0)
6469
ZEND_ARG_INFO(0, left_operand)
6570
ZEND_ARG_INFO(0, right_operand)
6671
ZEND_END_ARG_INFO()
6772

73+
static
6874
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpowmod, 0, 0, 3)
6975
ZEND_ARG_INFO(0, x)
7076
ZEND_ARG_INFO(0, y)
7177
ZEND_ARG_INFO(0, mod)
7278
ZEND_ARG_INFO(0, scale)
7379
ZEND_END_ARG_INFO()
7480

81+
static
7582
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpow, 0, 0, 2)
7683
ZEND_ARG_INFO(0, x)
7784
ZEND_ARG_INFO(0, y)
7885
ZEND_ARG_INFO(0, scale)
7986
ZEND_END_ARG_INFO()
8087

88+
static
8189
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsqrt, 0, 0, 1)
8290
ZEND_ARG_INFO(0, operand)
8391
ZEND_ARG_INFO(0, scale)
8492
ZEND_END_ARG_INFO()
8593

94+
static
8695
ZEND_BEGIN_ARG_INFO_EX(arginfo_bccomp, 0, 0, 2)
8796
ZEND_ARG_INFO(0, left_operand)
8897
ZEND_ARG_INFO(0, right_operand)
8998
ZEND_ARG_INFO(0, scale)
9099
ZEND_END_ARG_INFO()
91100

101+
static
92102
ZEND_BEGIN_ARG_INFO(arginfo_bcscale, 0)
93103
ZEND_ARG_INFO(0, scale)
94104
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)