[PHP-CVS] com php-src: Remove duplicate calls to set filename lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases: Zend/zend_dtrace.c
Commit:5ab6d215fca55a33b0f144c69afdcf9121d248eb
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 16:32:53
-0700
Committer: Nikita Popov ni...@php.net Fri, 23 Aug 2013 13:27:42 +0200
Parents: 7109f369e84838a852cd0f0c591fd58a1bc4
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5ab6d215fca55a33b0f144c69afdcf9121d248eb
Log:
Remove duplicate calls to set filename lineno for the
DTRACE_FUNCTION_ENTRY/RETURN cases
Changed paths:
M Zend/zend_dtrace.c
Diff:
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index 8846893..65c0193 100644
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -58,10 +58,8 @@ ZEND_API void dtrace_execute(zend_op_array *op_array
TSRMLS_DC)
}
if (DTRACE_FUNCTION_ENTRY_ENABLED() ||
DTRACE_FUNCTION_RETURN_ENABLED()) {
- filename = dtrace_get_executed_filename(TSRMLS_C);
classname = get_active_class_name(scope TSRMLS_CC);
funcname = get_active_function_name(TSRMLS_C);
- lineno = zend_get_executed_lineno(TSRMLS_C);
}
if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_dtrace.c
Commit:686402a865d13b5cf331a5fc1966e6f35046eb4d Author:Nikita Popov ni...@php.net Fri, 23 Aug 2013 13:28:59 +0200 Parents: c1ecdfbf6ec6d3d7962d66ab3cbbfd21b2ac9685 5ab6d215fca55a33b0f144c69afdcf9121d248eb Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=686402a865d13b5cf331a5fc1966e6f35046eb4d Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM Zend/zend_dtrace.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: ensure the test doesn't fail because of tz warning: ext/date/tests/bug65184.phpt
Commit:a2b1546f3b59095b65a5624494c778078cb5a87f
Author:Anatol Belski a...@php.net Fri, 23 Aug 2013 16:40:28 +0200
Parents: 686402a865d13b5cf331a5fc1966e6f35046eb4d
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a2b1546f3b59095b65a5624494c778078cb5a87f
Log:
ensure the test doesn't fail because of tz warning
Changed paths:
M ext/date/tests/bug65184.phpt
Diff:
diff --git a/ext/date/tests/bug65184.phpt b/ext/date/tests/bug65184.phpt
index adfd8d8..9bb6855 100644
--- a/ext/date/tests/bug65184.phpt
+++ b/ext/date/tests/bug65184.phpt
@@ -6,6 +6,8 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
die(skip Test is valid for Windows);
}
?
+--INI--
+date.timezone = UTC
--FILE--
?php
setlocale(LC_ALL, 'Japanese_Japan.932');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:768c34e7cd4a7d9f7290825e887cb90fa0b137cc Author:Christopher Jones s...@php.net Fri, 23 Aug 2013 08:13:59 -0700 Parents: 5ab6d215fca55a33b0f144c69afdcf9121d248eb Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=768c34e7cd4a7d9f7290825e887cb90fa0b137cc Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 1218c50..d73cf3e 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2013, PHP 5.4.20 - Core: + . Fixed bug #65490 (Duplicate calls to get lineno filename for +DTRACE_FUNCTION_*). (Chris Jones) . Fixed bug #65481 (shutdown segfault due to serialize) (Mike) . Fixed bug #65470 (Segmentation fault in zend_error() with --enable-dtrace). (Chris Jones, Kris Van Hees) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:38f9c515cdee7c7c0e1c204ba24027de04e3936e Author:Christopher Jones s...@php.net Fri, 23 Aug 2013 08:18:33 -0700 Parents: a2b1546f3b59095b65a5624494c778078cb5a87f Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=38f9c515cdee7c7c0e1c204ba24027de04e3936e Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 6d62951..5ff378b 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2013, PHP 5.5.4 - Core: + . Fixed bug #65490 (Duplicate calls to get lineno filename for +DTRACE_FUNCTION_*). (Chris Jones) . Fixed bug #65470 (Segmentation fault in zend_error() with --enable-dtrace). (Chris Jones, Kris Van Hees) . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Suppress static analyzer warnings in specialized executor: Zend/zend_vm_execute.h Zend/zend_vm_gen.php
Commit:716fc80fda937bedba786445d6b1854c48af12f8
Author:Anatol Belski a...@php.net Fri, 23 Aug 2013 17:41:07 +0200
Parents: 38f9c515cdee7c7c0e1c204ba24027de04e3936e
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=716fc80fda937bedba786445d6b1854c48af12f8
Log:
Suppress static analyzer warnings in specialized executor
As things like if(0) will be removed by the compiler, no need
to see that tons of warnings with static analyzer enabled.
Changed paths:
M Zend/zend_vm_execute.h
M Zend/zend_vm_gen.php
Diff:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index a80d9a4..2ba6bfe 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -20,6 +20,13 @@
#ifdef ZEND_WIN32
# pragma warning(once : 4101)
+# pragma warning(once : 6235)
+# pragma warning(once : 6237)
+# pragma warning(once : 6239)
+# pragma warning(once : 6240)
+# pragma warning(once : 6285)
+# pragma warning(once : 6286)
+# pragma warning(once : 6326)
#endif
static user_opcode_handler_t zend_user_opcode_handlers[256] = {
(user_opcode_handler_t)NULL,
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 9a75711..9b2877b 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1189,8 +1189,26 @@ function gen_vm($def, $skel) {
// Insert header
out($f, $GLOBALS['header_text']);
+ out($f, #ifdef ZEND_WIN32\n);
// Suppress free_op1 warnings on Windows
- out($f, #ifdef ZEND_WIN32\n# pragma warning(once : 4101)\n#endif\n);
+ out($f, # pragma warning(once : 4101)\n);
+ if (ZEND_VM_SPEC) {
+ // Suppress (non-zero constant || expression) warnings on
windows
+ out($f, # pragma warning(once : 6235)\n);
+ // Suppress (zero expression) warnings on windows
+ out($f, # pragma warning(once : 6237)\n);
+ // Suppress (non-zero constant expression) warnings on
windows
+ out($f, # pragma warning(once : 6239)\n);
+ // Suppress (expression non-zero constant) warnings on
windows
+ out($f, # pragma warning(once : 6240)\n);
+ // Suppress (non-zero constant || non-zero constant)
warnings on windows
+ out($f, # pragma warning(once : 6285)\n);
+ // Suppress (non-zero constant || expression) warnings on
windows
+ out($f, # pragma warning(once : 6286)\n);
+ // Suppress constant with constant comparsion warnings on
windows
+ out($f, # pragma warning(once : 6326)\n);
+ }
+ out($f, #endif\n);
// Support for ZEND_USER_OPCODE
out($f, static user_opcode_handler_t zend_user_opcode_handlers[256] =
{\n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_execute.h Zend/zend_vm_gen.php
Commit:07fa043cc3cb2c76f8b42915a64a43d0429f7c00 Author:Anatol Belski a...@php.net Fri, 23 Aug 2013 17:45:45 +0200 Parents: 77303a32481519b888061b8851771fb111c13c54 716fc80fda937bedba786445d6b1854c48af12f8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=07fa043cc3cb2c76f8b42915a64a43d0429f7c00 Log: Merge branch 'PHP-5.5' * PHP-5.5: Suppress static analyzer warnings in specialized executor Update NEWS Changed paths: MM Zend/zend_vm_execute.h MM Zend/zend_vm_gen.php Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
