constexpr + noexcept in exe

Author: mrotteveel

src/jrd/exe.cpp

@@ -123,7 +123,7 @@ string Item::getDescription(Request* request, const ItemInfo* itemInfo) const
 	if (itemInfo && itemInfo->name.hasData())
 		return itemInfo->name.toQuotedString();
 
-	int oneBasedIndex = index + 1;
+	const int oneBasedIndex = index + 1;
 	string s;
 
 	if (type == Item::TYPE_VARIABLE)
@@ -156,23 +156,23 @@ string Item::getDescription(Request* request, const ItemInfo* itemInfo) const
 
 // AffectedRows class implementation
 
-AffectedRows::AffectedRows()
+AffectedRows::AffectedRows() noexcept
 {
 	clear();
 }
 
-void AffectedRows::clear()
+void AffectedRows::clear() noexcept
 {
 	writeFlag = false;
 	fetchedRows = modifiedRows = 0;
 }
 
-void AffectedRows::bumpFetched()
+void AffectedRows::bumpFetched() noexcept
 {
 	fetchedRows++;
 }
 
-void AffectedRows::bumpModified(bool increment)
+void AffectedRows::bumpModified(bool increment) noexcept
 {
 	if (increment) {
 		modifiedRows++;
@@ -182,7 +182,7 @@ void AffectedRows::bumpModified(bool increment)
 	}
 }
 
-int AffectedRows::getCount() const
+int AffectedRows::getCount() const noexcept
 {
 	return writeFlag ? modifiedRows : fetchedRows;
 }
@@ -200,12 +200,12 @@ void StatusXcp::clear()
 	status->init();
 }
 
-void StatusXcp::init(const FbStatusVector* vector)
+void StatusXcp::init(const FbStatusVector* vector) noexcept
 {
 	fb_utils::copyStatus(&status, vector);
 }
 
-void StatusXcp::copyTo(FbStatusVector* vector) const
+void StatusXcp::copyTo(FbStatusVector* vector) const noexcept
 {
 	fb_utils::copyStatus(vector, &status);
 }
@@ -261,7 +261,7 @@ static void release_blobs(thread_db*, Request*);
 static void trigger_failure(thread_db*, Request*);
 static void stuff_stack_trace(const Request*);
 
-const size_t MAX_STACK_TRACE = 2048;
+constexpr size_t MAX_STACK_TRACE = 2048;
 
 
 namespace
@@ -1375,6 +1375,10 @@ void EXE_execute_triggers(thread_db* tdbb,
 						case TriggerAction::TRIGGER_INSERT:
 							SystemTriggers::executeBeforeInsertTriggers(tdbb, relation, new_rec);
 							break;
+
+						default:
+							// other trigger actions not relevant here
+							break;
 					}
 					break;
 				}
@@ -1385,8 +1389,16 @@ void EXE_execute_triggers(thread_db* tdbb,
 						case TriggerAction::TRIGGER_DELETE:
 							SystemTriggers::executeAfterDeleteTriggers(tdbb, relation, old_rec);
 							break;
+
+						default:
+							// other trigger actions not relevant here
+							break;
 					}
 					break;
+
+				default:
+					// other trigger types not relevant here
+					break;
 			}
 		}
 	}

src/jrd/exe.h

@@ -95,33 +95,33 @@ enum SortDirection { ORDER_ANY, ORDER_ASC, ORDER_DESC };
 enum NullsPlacement { NULLS_DEFAULT, NULLS_FIRST, NULLS_LAST };
 
 // CompilerScratch.csb_g_flags' values.
-const int csb_internal			= 1;	// "csb_g_flag" switch
-const int csb_get_dependencies	= 2;	// we are retrieving dependencies
-const int csb_ignore_perm		= 4;	// ignore permissions checks
-//const int csb_blr_version4		= 8;	// the BLR is of version 4
-const int csb_pre_trigger		= 16;	// this is a BEFORE trigger
-const int csb_post_trigger		= 32;	// this is an AFTER trigger
-const int csb_validation		= 64;	// we're in a validation expression (RDB hack)
-const int csb_reuse_context		= 128;	// allow context reusage
-const int csb_subroutine		= 256;	// sub routine
-const int csb_reload			= 512;	// request's BLR should be loaded and parsed again
-const int csb_computed_field	= 1024;	// computed field expression
-const int csb_search_system_schema = 2048;	// search system schema
+inline constexpr int csb_internal			= 1;	// "csb_g_flag" switch
+inline constexpr int csb_get_dependencies	= 2;	// we are retrieving dependencies
+inline constexpr int csb_ignore_perm		= 4;	// ignore permissions checks
+//inline constexpr int csb_blr_version4		= 8;	// the BLR is of version 4
+inline constexpr int csb_pre_trigger		= 16;	// this is a BEFORE trigger
+inline constexpr int csb_post_trigger		= 32;	// this is an AFTER trigger
+inline constexpr int csb_validation			= 64;	// we're in a validation expression (RDB hack)
+inline constexpr int csb_reuse_context		= 128;	// allow context reusage
+inline constexpr int csb_subroutine			= 256;	// sub routine
+inline constexpr int csb_reload				= 512;	// request's BLR should be loaded and parsed again
+inline constexpr int csb_computed_field		= 1024;	// computed field expression
+inline constexpr int csb_search_system_schema = 2048;	// search system schema
 
 // CompilerScratch.csb_rpt[].csb_flags's values.
-const int csb_active		= 1;		// stream is active
-const int csb_used			= 2;		// context has already been defined (BLR parsing only)
-const int csb_view_update	= 4;		// view update w/wo trigger is in progress
-const int csb_trigger		= 8;		// NEW or OLD context in trigger
-//const int csb_no_dbkey		= 16;		// unused
-const int csb_store			= 32;		// we are processing a store statement
-const int csb_modify		= 64;		// we are processing a modify
-const int csb_sub_stream	= 128;		// a sub-stream of the RSE being processed
-const int csb_erase			= 256;		// we are processing an erase
-const int csb_unmatched		= 512;		// stream has conjuncts unmatched by any index
-const int csb_update		= 1024;		// erase or modify for relation
-const int csb_unstable		= 2048;		// unstable explicit cursor
-const int csb_skip_locked	= 4096;		// skip locked record
+inline constexpr int csb_active			= 1;		// stream is active
+inline constexpr int csb_used			= 2;		// context has already been defined (BLR parsing only)
+inline constexpr int csb_view_update	= 4;		// view update w/wo trigger is in progress
+inline constexpr int csb_trigger		= 8;		// NEW or OLD context in trigger
+//inline constexpr int csb_no_dbkey		= 16;		// unused
+inline constexpr int csb_store			= 32;		// we are processing a store statement
+inline constexpr int csb_modify			= 64;		// we are processing a modify
+inline constexpr int csb_sub_stream		= 128;		// a sub-stream of the RSE being processed
+inline constexpr int csb_erase			= 256;		// we are processing an erase
+inline constexpr int csb_unmatched		= 512;		// stream has conjuncts unmatched by any index
+inline constexpr int csb_update			= 1024;		// erase or modify for relation
+inline constexpr int csb_unstable		= 2048;		// unstable explicit cursor
+inline constexpr int csb_skip_locked	= 4096;		// skip locked record
 
 
 // Aggregate Sort Block (for DISTINCT aggregates)
@@ -185,7 +185,7 @@ struct Resource
 	Routine*	rsc_routine;	// Routine block
 	Collation*	rsc_coll;		// Collation block
 
-	static bool greaterThan(const Resource& i1, const Resource& i2)
+	static bool greaterThan(const Resource& i1, const Resource& i2) noexcept
 	{
 		// A few places of the engine depend on fact that rsc_type
 		// is the first field in ResourceList ordering
@@ -200,7 +200,7 @@ struct Resource
 		return i1.rsc_id > i2.rsc_id;
 	}
 
-	Resource(rsc_s type, USHORT id, jrd_rel* rel, Routine* routine, Collation* coll)
+	Resource(rsc_s type, USHORT id, jrd_rel* rel, Routine* routine, Collation* coll) noexcept
 		: rsc_type(type), rsc_id(id), rsc_rel(rel), rsc_routine(routine), rsc_coll(coll)
 	{ }
 };
@@ -327,14 +327,14 @@ struct Item
 		TYPE_CAST
 	};
 
-	Item(Type aType, UCHAR aSubType, USHORT aIndex)
+	Item(Type aType, UCHAR aSubType, USHORT aIndex) noexcept
 		: type(aType),
 		  subType(aSubType),
 		  index(aIndex)
 	{
 	}
 
-	Item(Type aType, USHORT aIndex = 0)
+	Item(Type aType, USHORT aIndex = 0) noexcept
 		: type(aType),
 		  subType(0),
 		  index(aIndex)
@@ -345,7 +345,7 @@ struct Item
 	UCHAR subType;
 	USHORT index;
 
-	bool operator >(const Item& x) const
+	bool operator >(const Item& x) const noexcept
 	{
 		if (type == x.type)
 		{
@@ -363,7 +363,7 @@ struct Item
 
 struct FieldInfo
 {
-	FieldInfo()
+	FieldInfo() noexcept
 		: nullable(false), defaultValue(NULL), validationExpr(NULL)
 	{}
 
@@ -393,7 +393,7 @@ class ItemInfo : public Printable
 	{
 	}
 
-	ItemInfo()
+	ItemInfo() noexcept
 		: name(),
 		  field(),
 		  nullable(true),
@@ -403,7 +403,7 @@ class ItemInfo : public Printable
 	}
 
 public:
-	bool isSpecial() const
+	bool isSpecial() const noexcept
 	{
 		return !nullable || fullDomain;
 	}
@@ -543,7 +543,7 @@ class CompilerScratch : public pool_alloc<type_csb>
 		return csb_n_stream++;
 	}
 
-	bool collectingDependencies() const
+	bool collectingDependencies() const noexcept
 	{
 		return (mainCsb ? mainCsb : this)->csb_g_flags & csb_get_dependencies;
 	}
@@ -654,10 +654,10 @@ class CompilerScratch : public pool_alloc<type_csb>
 	struct csb_repeat
 	{
 		// We must zero-initialize this one
-		csb_repeat();
+		csb_repeat() noexcept;
 
-		void activate();
-		void deactivate();
+		void activate() noexcept;
+		void deactivate() noexcept;
 		QualifiedName getName(bool allowEmpty = true) const;
 
 		std::optional<USHORT> csb_cursor_number;	// Cursor number for this stream
@@ -688,7 +688,7 @@ class CompilerScratch : public pool_alloc<type_csb>
 };
 
 	// We must zero-initialize this one
-inline CompilerScratch::csb_repeat::csb_repeat()
+inline CompilerScratch::csb_repeat::csb_repeat() noexcept
 	: csb_stream(0),
 	  csb_view_stream(0),
 	  csb_flags(0),
@@ -709,12 +709,12 @@ inline CompilerScratch::csb_repeat::csb_repeat()
 {
 }
 
-inline void CompilerScratch::csb_repeat::activate()
+inline void CompilerScratch::csb_repeat::activate() noexcept
 {
 	csb_flags |= csb_active;
 }
 
-inline void CompilerScratch::csb_repeat::deactivate()
+inline void CompilerScratch::csb_repeat::deactivate() noexcept
 {
 	csb_flags &= ~csb_active;
 }
@@ -756,8 +756,8 @@ class StatusXcp
 	StatusXcp();
 
 	void clear();
-	void init(const Jrd::FbStatusVector*);
-	void copyTo(Jrd::FbStatusVector*) const;
+	void init(const Jrd::FbStatusVector*) noexcept;
+	void copyTo(Jrd::FbStatusVector*) const noexcept;
 	bool success() const;
 	SLONG as_gdscode() const;
 	SLONG as_sqlcode() const;
@@ -767,7 +767,7 @@ class StatusXcp
 };
 
 // must correspond to the declared size of RDB$EXCEPTIONS.RDB$MESSAGE
-const unsigned XCP_MESSAGE_LENGTH = 1023;
+inline constexpr unsigned XCP_MESSAGE_LENGTH = 1023;
 
 // Array which stores relative pointers to impure areas of invariant nodes
 typedef Firebird::SortedArray<ULONG> VarInvariantArray;

src/jrd/exe_proto.h

@@ -72,7 +72,7 @@ namespace Jrd
 		CachedRequestId& operator=(const CachedRequestId&) = delete;
 
 	public:
-		USHORT getId() const
+		USHORT getId() const noexcept
 		{
 			return id;
 		}
@@ -101,7 +101,7 @@ namespace Jrd
 		{
 		}
 
-		AutoCacheRequest()
+		AutoCacheRequest() noexcept
 			: id(0),
 			  which(0),
 			  request(NULL)
@@ -141,17 +141,17 @@ namespace Jrd
 			cacheRequest();
 		}
 
-		Request* operator ->()
+		Request* operator ->() noexcept
 		{
 			return request;
 		}
 
-		operator Request*()
+		operator Request*() noexcept
 		{
 			return request;
 		}
 
-		bool operator !() const
+		bool operator !() const noexcept
 		{
 			return !request;
 		}
@@ -177,7 +177,7 @@ namespace Jrd
 	class AutoRequest
 	{
 	public:
-		AutoRequest()
+		AutoRequest() noexcept
 			: request(NULL)
 		{
 		}
@@ -201,17 +201,17 @@ namespace Jrd
 			request = CMP_compile_request(tdbb, blr, blrLength, true);
 		}
 
-		Request* operator ->()
+		Request* operator ->() noexcept
 		{
 			return request;
 		}
 
-		operator Request*()
+		operator Request*() noexcept
 		{
 			return request;
 		}
 
-		bool operator !() const
+		bool operator !() const noexcept
 		{
 			return !request;
 		}