Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add early bail-outs to same_type()

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-12-10 17:49:38 +00:00
parent 8816547964
commit 6f61463a48
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Type.h
View file

@ -828,21 +828,37 @@ extern bool same_type(const Type& t1, const Type& t2, bool is_init = false,
inline bool same_type(const TypePtr& t1, const TypePtr& t2, bool is_init = false, inline bool same_type(const TypePtr& t1, const TypePtr& t2, bool is_init = false,
bool match_record_field_names = true) bool match_record_field_names = true)
{ {
// If the pointers are identical, the type should be the same type.
if ( t1.get() == t2.get() )
return true;
return same_type(*t1, *t2, is_init, match_record_field_names); return same_type(*t1, *t2, is_init, match_record_field_names);
} }
inline bool same_type(const Type* t1, const Type* t2, bool is_init = false, inline bool same_type(const Type* t1, const Type* t2, bool is_init = false,
bool match_record_field_names = true) bool match_record_field_names = true)
{ {
// If the pointers are identical, the type should be the same type.
if ( t1 == t2 )
return true;
return same_type(*t1, *t2, is_init, match_record_field_names); return same_type(*t1, *t2, is_init, match_record_field_names);
} }
inline bool same_type(const TypePtr& t1, const Type* t2, bool is_init = false, inline bool same_type(const TypePtr& t1, const Type* t2, bool is_init = false,
bool match_record_field_names = true) bool match_record_field_names = true)
{ {
// If the pointers are identical, the type should be the same type.
if ( t1.get() == t2 )
return true;
return same_type(*t1, *t2, is_init, match_record_field_names); return same_type(*t1, *t2, is_init, match_record_field_names);
} }
inline bool same_type(const Type* t1, const TypePtr& t2, bool is_init = false, inline bool same_type(const Type* t1, const TypePtr& t2, bool is_init = false,
bool match_record_field_names = true) bool match_record_field_names = true)
{ {
// If the pointers are identical, the type should be the same type.
if ( t1 == t2.get() )
return true;
return same_type(*t1, *t2, is_init, match_record_field_names); return same_type(*t1, *t2, is_init, match_record_field_names);
} }