Skip to content

Create PERL_UNIQUE_NAME and use it to avoid name collisions #23614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khwilliamson merged 2 commits into from
Sep 11, 2025
Merged

Create PERL_UNIQUE_NAME and use it to avoid name collisions #23614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6de8837
Add macro PERL_UNIQUE_NAME
khwilliamson Sep 3, 2025
cfccf60
Change names in OpTYPE_set() to avoid possible collisions
khwilliamson Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,14 @@ typedef PERL_BITFIELD16 Optype;
U8 op_private;
#endif

#define o1_ PERL_UNIQUE_NAME(o)
#define type1_ PERL_UNIQUE_NAME(type)
#define OpTYPE_set(o,type) \
STMT_START { \
OP *o_ = (OP *)o; \
OPCODE type_ = type; \
o_->op_type = type_; \
o_->op_ppaddr = PL_ppaddr[type_]; \
OP *o1_ = (OP *)o; \
OPCODE type1_ = type; \
o1_->op_type = type1_; \
o1_->op_ppaddr = PL_ppaddr[type1_]; \
} STMT_END

/* If op_type:9 is changed to :10, also change cx_pusheval()
Expand Down
18 changes: 10 additions & 8 deletions perl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4208,6 +4208,14 @@ Obsolete form of C<UVuf>, which you should convert to instead use
# define UVf UVuf
#endif

/* Use this like:
* #define sv1_ PERL_UNIQUE_NAME(sv)
* and it will expand to something very likely unique to your file, beginning
* with 'PL_' which means there should be no name collision with the caller.
* an underscore. If two 'sv1_' are attempted to be defined, a compiler
* warning will get raised, so you can change one of them. */
#define PERL_UNIQUE_NAME(name) CAT2(PL_, CAT2(name, __LINE__))

#if !defined(DEBUGGING) && !defined(NDEBUG)
# define NDEBUG 1
#endif
Expand Down Expand Up @@ -4323,15 +4331,9 @@ where it has parity with the other two forms.
* We use a bit-field instead of an array because gcc accepts
typedef char x[n]
where n is not a compile-time constant. We want to enforce constantness.
*
* We need the FOOL macros to get proper cpp parameter concatanation. */
# define STATIC_ASSERT_STRUCT_NAME_FOOL_CPP_2_(line) \
static_assertion_failed_##line
# define STATIC_ASSERT_STRUCT_NAME_FOOL_CPP_(line) \
STATIC_ASSERT_STRUCT_NAME_FOOL_CPP_2_(line)
*/
/* Return the struct and element name */
# define STATIC_ASSERT_STRUCT_NAME_ \
STATIC_ASSERT_STRUCT_NAME_FOOL_CPP_(__LINE__)
# define STATIC_ASSERT_STRUCT_NAME_ PERL_UNIQUE_NAME(static_assertion_failed_)

/* Return the struct body */
# define STATIC_ASSERT_STRUCT_BODY_(COND, NAME) \
Expand Down
Loading