From 0d6394e008c2a6829d4a98b5b9840c308d4cb6c3 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 14 Jan 2021 16:07:36 -0800 Subject: [PATCH] Remove superfluous nullptr checks in Val/RecordVal methods --- src/Val.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Val.h b/src/Val.h index ecdb5bb8ee..fce0449bc5 100644 --- a/src/Val.h +++ b/src/Val.h @@ -215,12 +215,7 @@ UNDERLYING_ACCESSOR_DECL(TypeVal, zeek::Type*, AsType) { // Since we're converting from "this", make sure the type requested is a pointer. static_assert(std::is_pointer()); - - auto v = static_cast(this); - if ( ! v ) - reporter->InternalError("Failed dynamic_cast between Val types"); - - return v; + return static_cast(this); } protected: @@ -1264,9 +1259,6 @@ public: { auto& field_ptr = GetField(field); auto field_val_ptr = static_cast(field_ptr.get()); - if ( ! field_val_ptr ) - reporter->InternalError("Typecast failed in TableVal::GetFieldAs"); - return field_val_ptr->Get(); } @@ -1275,9 +1267,6 @@ public: { auto& field_ptr = GetField(field); auto field_val_ptr = static_cast(field_ptr.get()); - if ( ! field_val_ptr ) - reporter->InternalError("Typecast failed in TableVal::GetFieldAs"); - return field_val_ptr->Get(); }