Change 34411 by [EMAIL PROTECTED] on 2008/09/23 20:01:01
Integrate:
[ 34351]
The stash argument to S_isa_lookup() actually never is NULL.
[ 34352]
As stash can't be NULL, no need to check name_stash is not NULL before
comparing the two, as a NULL == NULL comparison can't happen.
Affected files ...
... //depot/maint-5.10/perl/embed.fnc#12 integrate
... //depot/maint-5.10/perl/proto.h#10 integrate
... //depot/maint-5.10/perl/universal.c#5 integrate
Differences ...
==== //depot/maint-5.10/perl/embed.fnc#12 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#11~34410~ 2008-09-23 12:31:18.000000000 -0700
+++ perl/embed.fnc 2008-09-23 13:01:01.000000000 -0700
@@ -1589,7 +1589,7 @@
#endif
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
-s |bool|isa_lookup |NULLOK HV *stash|NN const char * const name
+s |bool|isa_lookup |NN HV *stash|NN const char * const name
#endif
#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
==== //depot/maint-5.10/perl/proto.h#10 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#9~34410~ 2008-09-23 12:31:18.000000000 -0700
+++ perl/proto.h 2008-09-23 13:01:01.000000000 -0700
@@ -4187,6 +4187,7 @@
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
STATIC bool S_isa_lookup(pTHX_ HV *stash, const char * const name)
+ __attribute__nonnull__(pTHX_1)
__attribute__nonnull__(pTHX_2);
#endif
==== //depot/maint-5.10/perl/universal.c#5 (text) ====
Index: perl/universal.c
--- perl/universal.c#4~34410~ 2008-09-23 12:31:18.000000000 -0700
+++ perl/universal.c 2008-09-23 13:01:01.000000000 -0700
@@ -48,7 +48,7 @@
/* A stash/class can go by many names (ie. User == main::User), so
we compare the stash itself just in case */
- if (name_stash && ((const HV *)stash == name_stash))
+ if ((const HV *)stash == name_stash)
return TRUE;
hvname = HvNAME_get(stash);
End of Patch.
