Drop TSRM_ASSERT macro #5562
Closed
Drop TSRM_ASSERT macro #5562
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nikic
reviewed
May 13, 2020
TSRM/TSRM.c
Outdated
| #else | ||
| # define TSRM_ASSERT | ||
| #endif | ||
| #include "Zend/zend_portability.h" |
There was a problem hiding this comment.
This is a bit dirty, in that TSRM is not supposed to depend on Zend... Though that separation probably is not particularly important nowadays anymore.
There was a problem hiding this comment.
We are already depending on ZEND_DEBUG, or should that be an #ifdef TSRM_DEBUG?
If we don't drop it, its definition should probably be changed to TSRM_ASSERT(c) assert(c) as otherwise we get the following compiler warning on release builds as can be seen from #5526 :
/home/vsts/work/1/s/TSRM/TSRM.c: In function ‘ts_free_thread’:
/home/vsts/work/1/s/TSRM/TSRM.c:482:14: warning: statement with no effect [-Wunused-value]
TSRM_ASSERT(!in_main_thread);
~^~~~~~~~~~~~~~~~
|
@nikic I've changed it to not rely on zend_portability.h by fixing the macro definition. |
nikic
approved these changes
May 18, 2020
| # include <assert.h> | ||
| # define TSRM_ASSERT assert | ||
| # define TSRM_ASSERT(c) assert(c) |
There was a problem hiding this comment.
Suggested change
| # define TSRM_ASSERT(c) assert(c) | |
| # define TSRM_ASSERT(c) assert(c) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It is only used once, and because ZEND_DEBUG is always defined we were asserting even in non debug builds