Prohibit inheritance of interface with versioned methods (#8982)

Noremos · Artyom Abakumov · web-flow · commit cb1f8286dfec · 2026-04-09T10:12:05.000+03:00
* Prohibit inherence of interface with versioned methods

* Add blank lines before version token and missing const qualifier

---------

Co-authored-by: Artyom Abakumov &lt;artyom.abakumov@red-soft.ru&gt;
diff --git a/extern/cloop/src/cloop/Parser.cpp b/extern/cloop/src/cloop/Parser.cpp
@@ -116,6 +116,12 @@ void Parser::parse()
 	}
 }
 
+static bool hasVersionedMethods(const Interface& interface)
+{
+	const auto& methods = interface.methods;
+	return methods.size() >= 2 && methods.front()->version != methods.back()->version;
+}
+
 void Parser::parseInterface(bool exception)
 {
 	auto newInterface = std::make_shared<Interface>();
@@ -140,6 +146,9 @@ void Parser::parseInterface(bool exception)
 			error(token, string("Super interface '") + superName + "' not found.");
 
 		interface->super = static_cast<Interface*>(superIt->second.get());
+		if (hasVersionedMethods(*interface->super))
+			error(token, string("Inheriting from the interface '" + superName + "' is not possible because it contains versioned methods."));
+
 		interface->version = interface->super->version + 1;
 	}
 	else
diff --git a/src/include/firebird/FirebirdInterface.idl b/src/include/firebird/FirebirdInterface.idl
@@ -1382,9 +1382,6 @@ interface TraceStatement : Versioned
 {
 	int64 getStmtID();
 	PerformanceInfo* getPerf();
-
-version: // 5.0 -> 6.0
-	PerformanceStats getPerfStats();
 }
 
 interface TraceSQLStatement : TraceStatement
@@ -1394,13 +1391,19 @@ interface TraceSQLStatement : TraceStatement
 	TraceParams getInputs();
 	const string getTextUTF8();
 	const string getExplainedPlan();
+
+version: // 5.0 -> 6.0
+	PerformanceStats getPerfStats();
 }
 
 interface TraceBLRStatement : TraceStatement
 {
 	const uchar* getData();
 	uint getDataLength();
 	const string getText();
+
+version: // 5.0 -> 6.0
+	PerformanceStats getPerfStats();
 }
 
 interface TraceDYNRequest : Versioned
diff --git a/src/include/firebird/IdlFbInterfaces.h b/src/include/firebird/IdlFbInterfaces.h
@@ -5609,7 +5609,7 @@ namespace Firebird
 		}
 	};
 
-#define FIREBIRD_ITRACE_STATEMENT_VERSION 3u
+#define FIREBIRD_ITRACE_STATEMENT_VERSION 2u
 
 	class ITraceStatement : public IVersioned
 	{
@@ -5618,7 +5618,6 @@ namespace Firebird
 		{
 			ISC_INT64 (CLOOP_CARG *getStmtID)(ITraceStatement* self) CLOOP_NOEXCEPT;
 			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceStatement* self) CLOOP_NOEXCEPT;
-			IPerformanceStats* (CLOOP_CARG *getPerfStats)(ITraceStatement* self) CLOOP_NOEXCEPT;
 		};
 
 	protected:
@@ -5645,16 +5644,6 @@ namespace Firebird
 			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
 			return ret;
 		}
-
-		IPerformanceStats* getPerfStats()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			IPerformanceStats* ret = static_cast<VTable*>(this->cloopVTable)->getPerfStats(this);
-			return ret;
-		}
 	};
 
 #define FIREBIRD_ITRACE_SQLSTATEMENT_VERSION 4u
@@ -5669,6 +5658,7 @@ namespace Firebird
 			ITraceParams* (CLOOP_CARG *getInputs)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
 			const char* (CLOOP_CARG *getTextUTF8)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
 			const char* (CLOOP_CARG *getExplainedPlan)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
+			IPerformanceStats* (CLOOP_CARG *getPerfStats)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
 		};
 
 	protected:
@@ -5713,6 +5703,16 @@ namespace Firebird
 			const char* ret = static_cast<VTable*>(this->cloopVTable)->getExplainedPlan(this);
 			return ret;
 		}
+
+		IPerformanceStats* getPerfStats()
+		{
+			if (cloopVTable->version < 4)
+			{
+				return 0;
+			}
+			IPerformanceStats* ret = static_cast<VTable*>(this->cloopVTable)->getPerfStats(this);
+			return ret;
+		}
 	};
 
 #define FIREBIRD_ITRACE_BLRSTATEMENT_VERSION 4u
@@ -5725,6 +5725,7 @@ namespace Firebird
 			const unsigned char* (CLOOP_CARG *getData)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
 			unsigned (CLOOP_CARG *getDataLength)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
 			const char* (CLOOP_CARG *getText)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
+			IPerformanceStats* (CLOOP_CARG *getPerfStats)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
 		};
 
 	protected:
@@ -5757,6 +5758,16 @@ namespace Firebird
 			const char* ret = static_cast<VTable*>(this->cloopVTable)->getText(this);
 			return ret;
 		}
+
+		IPerformanceStats* getPerfStats()
+		{
+			if (cloopVTable->version < 4)
+			{
+				return 0;
+			}
+			IPerformanceStats* ret = static_cast<VTable*>(this->cloopVTable)->getPerfStats(this);
+			return ret;
+		}
 	};
 
 #define FIREBIRD_ITRACE_DYNREQUEST_VERSION 2u
@@ -18062,7 +18073,6 @@ namespace Firebird
 					this->version = Base::VERSION;
 					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
 					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;
 				}
 			} vTable;
 
@@ -18094,19 +18104,6 @@ namespace Firebird
 				return static_cast<PerformanceInfo*>(0);
 			}
 		}
-
-		static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerfStats();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IPerformanceStats*>(0);
-			}
-		}
 	};
 
 	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceStatement> > >
@@ -18124,7 +18121,6 @@ namespace Firebird
 
 		virtual ISC_INT64 getStmtID() = 0;
 		virtual PerformanceInfo* getPerf() = 0;
-		virtual IPerformanceStats* getPerfStats() = 0;
 	};
 
 	template <typename Name, typename StatusType, typename Base>
@@ -18142,12 +18138,12 @@ namespace Firebird
 					this->version = Base::VERSION;
 					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
 					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;
 					this->getText = &Name::cloopgetTextDispatcher;
 					this->getPlan = &Name::cloopgetPlanDispatcher;
 					this->getInputs = &Name::cloopgetInputsDispatcher;
 					this->getTextUTF8 = &Name::cloopgetTextUTF8Dispatcher;
 					this->getExplainedPlan = &Name::cloopgetExplainedPlanDispatcher;
+					this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;
 				}
 			} vTable;
 
@@ -18219,42 +18215,42 @@ namespace Firebird
 			}
 		}
 
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
+		static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT
 		{
 			try
 			{
-				return static_cast<Name*>(self)->Name::getStmtID();
+				return static_cast<Name*>(self)->Name::getPerfStats();
 			}
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
+				return static_cast<IPerformanceStats*>(0);
 			}
 		}
 
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
+		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
 		{
 			try
 			{
-				return static_cast<Name*>(self)->Name::getPerf();
+				return static_cast<Name*>(self)->Name::getStmtID();
 			}
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
+				return static_cast<ISC_INT64>(0);
 			}
 		}
 
-		static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
+		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
 		{
 			try
 			{
-				return static_cast<Name*>(self)->Name::getPerfStats();
+				return static_cast<Name*>(self)->Name::getPerf();
 			}
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<IPerformanceStats*>(0);
+				return static_cast<PerformanceInfo*>(0);
 			}
 		}
 	};
@@ -18277,6 +18273,7 @@ namespace Firebird
 		virtual ITraceParams* getInputs() = 0;
 		virtual const char* getTextUTF8() = 0;
 		virtual const char* getExplainedPlan() = 0;
+		virtual IPerformanceStats* getPerfStats() = 0;
 	};
 
 	template <typename Name, typename StatusType, typename Base>
@@ -18294,10 +18291,10 @@ namespace Firebird
 					this->version = Base::VERSION;
 					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
 					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;
 					this->getData = &Name::cloopgetDataDispatcher;
 					this->getDataLength = &Name::cloopgetDataLengthDispatcher;
 					this->getText = &Name::cloopgetTextDispatcher;
+					this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;
 				}
 			} vTable;
 
@@ -18343,42 +18340,42 @@ namespace Firebird
 			}
 		}
 
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
+		static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceBLRStatement* self) CLOOP_NOEXCEPT
 		{
 			try
 			{
-				return static_cast<Name*>(self)->Name::getStmtID();
+				return static_cast<Name*>(self)->Name::getPerfStats();
 			}
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
+				return static_cast<IPerformanceStats*>(0);
 			}
 		}
 
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
+		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
 		{
 			try
 			{
-				return static_cast<Name*>(self)->Name::getPerf();
+				return static_cast<Name*>(self)->Name::getStmtID();
 			}
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
+				return static_cast<ISC_INT64>(0);
 			}
 		}
 
-		static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
+		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
 		{
 			try
 			{
-				return static_cast<Name*>(self)->Name::getPerfStats();
+				return static_cast<Name*>(self)->Name::getPerf();
 			}
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<IPerformanceStats*>(0);
+				return static_cast<PerformanceInfo*>(0);
 			}
 		}
 	};
@@ -18399,6 +18396,7 @@ namespace Firebird
 		virtual const unsigned char* getData() = 0;
 		virtual unsigned getDataLength() = 0;
 		virtual const char* getText() = 0;
+		virtual IPerformanceStats* getPerfStats() = 0;
 	};
 
 	template <typename Name, typename StatusType, typename Base>
diff --git a/src/include/gen/Firebird.pas b/src/include/gen/Firebird.pas

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,12 @@ void Parser::parse()`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
	`119`	`+static bool hasVersionedMethods(const Interface& interface)`
	`120`	`+{`
	`121`	`+ const auto& methods = interface.methods;`
	`122`	`+ return methods.size() >= 2 && methods.front()->version != methods.back()->version;`
	`123`	`+}`
	`124`	`+`
`119`	`125`	`void Parser::parseInterface(bool exception)`
`120`	`126`	`{`
`121`	`127`	`auto newInterface = std::make_shared<Interface>();`
`@@ -140,6 +146,9 @@ void Parser::parseInterface(bool exception)`
`140`	`146`	`error(token, string("Super interface '") + superName + "' not found.");`
`141`	`147`
`142`	`148`	`interface->super = static_cast<Interface*>(superIt->second.get());`
	`149`	`+ if (hasVersionedMethods(*interface->super))`
	`150`	`+ error(token, string("Inheriting from the interface '" + superName + "' is not possible because it contains versioned methods."));`
	`151`	`+`
`143`	`152`	`interface->version = interface->super->version + 1;`
`144`	`153`	`}`
`145`	`154`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1382,9 +1382,6 @@ interface TraceStatement : Versioned`
`1382`	`1382`	`{`
`1383`	`1383`	`int64 getStmtID();`
`1384`	`1384`	`PerformanceInfo* getPerf();`
`1385`		`-`
`1386`		`-version: // 5.0 -> 6.0`
`1387`		`- PerformanceStats getPerfStats();`
`1388`	`1385`	`}`
`1389`	`1386`
`1390`	`1387`	`interface TraceSQLStatement : TraceStatement`
`@@ -1394,13 +1391,19 @@ interface TraceSQLStatement : TraceStatement`
`1394`	`1391`	`TraceParams getInputs();`
`1395`	`1392`	`const string getTextUTF8();`
`1396`	`1393`	`const string getExplainedPlan();`
	`1394`	`+`
	`1395`	`+version: // 5.0 -> 6.0`
	`1396`	`+ PerformanceStats getPerfStats();`
`1397`	`1397`	`}`
`1398`	`1398`
`1399`	`1399`	`interface TraceBLRStatement : TraceStatement`
`1400`	`1400`	`{`
`1401`	`1401`	`const uchar* getData();`
`1402`	`1402`	`uint getDataLength();`
`1403`	`1403`	`const string getText();`
	`1404`	`+`
	`1405`	`+version: // 5.0 -> 6.0`
	`1406`	`+ PerformanceStats getPerfStats();`
`1404`	`1407`	`}`
`1405`	`1408`
`1406`	`1409`	`interface TraceDYNRequest : Versioned`
Original file line number	Diff line number	Diff line change
`@@ -5609,7 +5609,7 @@ namespace Firebird`
`5609`	`5609`	`}`
`5610`	`5610`	`};`
`5611`	`5611`
`5612`		`-#define FIREBIRD_ITRACE_STATEMENT_VERSION 3u`
	`5612`	`+#define FIREBIRD_ITRACE_STATEMENT_VERSION 2u`
`5613`	`5613`
`5614`	`5614`	`class ITraceStatement : public IVersioned`
`5615`	`5615`	`{`
`@@ -5618,7 +5618,6 @@ namespace Firebird`
`5618`	`5618`	`{`
`5619`	`5619`	`ISC_INT64 (CLOOP_CARG getStmtID)(ITraceStatement self) CLOOP_NOEXCEPT;`
`5620`	`5620`	`PerformanceInfo* (CLOOP_CARG getPerf)(ITraceStatement self) CLOOP_NOEXCEPT;`
`5621`		`- IPerformanceStats* (CLOOP_CARG getPerfStats)(ITraceStatement self) CLOOP_NOEXCEPT;`
`5622`	`5621`	`};`
`5623`	`5622`
`5624`	`5623`	`protected:`
`@@ -5645,16 +5644,6 @@ namespace Firebird`
`5645`	`5644`	`PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);`
`5646`	`5645`	`return ret;`
`5647`	`5646`	`}`
`5648`		`-`
`5649`		`- IPerformanceStats* getPerfStats()`
`5650`		`- {`
`5651`		`- if (cloopVTable->version < 3)`
`5652`		`- {`
`5653`		`- return 0;`
`5654`		`- }`
`5655`		`- IPerformanceStats* ret = static_cast<VTable*>(this->cloopVTable)->getPerfStats(this);`
`5656`		`- return ret;`
`5657`		`- }`
`5658`	`5647`	`};`
`5659`	`5648`
`5660`	`5649`	`#define FIREBIRD_ITRACE_SQLSTATEMENT_VERSION 4u`
`@@ -5669,6 +5658,7 @@ namespace Firebird`
`5669`	`5658`	`ITraceParams* (CLOOP_CARG getInputs)(ITraceSQLStatement self) CLOOP_NOEXCEPT;`
`5670`	`5659`	`const char* (CLOOP_CARG getTextUTF8)(ITraceSQLStatement self) CLOOP_NOEXCEPT;`
`5671`	`5660`	`const char* (CLOOP_CARG getExplainedPlan)(ITraceSQLStatement self) CLOOP_NOEXCEPT;`
	`5661`	`+ IPerformanceStats* (CLOOP_CARG getPerfStats)(ITraceSQLStatement self) CLOOP_NOEXCEPT;`
`5672`	`5662`	`};`
`5673`	`5663`
`5674`	`5664`	`protected:`
`@@ -5713,6 +5703,16 @@ namespace Firebird`
`5713`	`5703`	`const char* ret = static_cast<VTable*>(this->cloopVTable)->getExplainedPlan(this);`
`5714`	`5704`	`return ret;`
`5715`	`5705`	`}`
	`5706`	`+`
	`5707`	`+ IPerformanceStats* getPerfStats()`
	`5708`	`+ {`
	`5709`	`+ if (cloopVTable->version < 4)`
	`5710`	`+ {`
	`5711`	`+ return 0;`
	`5712`	`+ }`
	`5713`	`+ IPerformanceStats* ret = static_cast<VTable*>(this->cloopVTable)->getPerfStats(this);`
	`5714`	`+ return ret;`
	`5715`	`+ }`
`5716`	`5716`	`};`
`5717`	`5717`
`5718`	`5718`	`#define FIREBIRD_ITRACE_BLRSTATEMENT_VERSION 4u`
`@@ -5725,6 +5725,7 @@ namespace Firebird`
`5725`	`5725`	`const unsigned char* (CLOOP_CARG getData)(ITraceBLRStatement self) CLOOP_NOEXCEPT;`
`5726`	`5726`	`unsigned (CLOOP_CARG getDataLength)(ITraceBLRStatement self) CLOOP_NOEXCEPT;`
`5727`	`5727`	`const char* (CLOOP_CARG getText)(ITraceBLRStatement self) CLOOP_NOEXCEPT;`
	`5728`	`+ IPerformanceStats* (CLOOP_CARG getPerfStats)(ITraceBLRStatement self) CLOOP_NOEXCEPT;`
`5728`	`5729`	`};`
`5729`	`5730`
`5730`	`5731`	`protected:`
`@@ -5757,6 +5758,16 @@ namespace Firebird`
`5757`	`5758`	`const char* ret = static_cast<VTable*>(this->cloopVTable)->getText(this);`
`5758`	`5759`	`return ret;`
`5759`	`5760`	`}`
	`5761`	`+`
	`5762`	`+ IPerformanceStats* getPerfStats()`
	`5763`	`+ {`
	`5764`	`+ if (cloopVTable->version < 4)`
	`5765`	`+ {`
	`5766`	`+ return 0;`
	`5767`	`+ }`
	`5768`	`+ IPerformanceStats* ret = static_cast<VTable*>(this->cloopVTable)->getPerfStats(this);`
	`5769`	`+ return ret;`
	`5770`	`+ }`
`5760`	`5771`	`};`
`5761`	`5772`
`5762`	`5773`	`#define FIREBIRD_ITRACE_DYNREQUEST_VERSION 2u`
`@@ -18062,7 +18073,6 @@ namespace Firebird`
`18062`	`18073`	`this->version = Base::VERSION;`
`18063`	`18074`	`this->getStmtID = &Name::cloopgetStmtIDDispatcher;`
`18064`	`18075`	`this->getPerf = &Name::cloopgetPerfDispatcher;`
`18065`		`- this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;`
`18066`	`18076`	`}`
`18067`	`18077`	`} vTable;`
`18068`	`18078`
`@@ -18094,19 +18104,6 @@ namespace Firebird`
`18094`	`18104`	`return static_cast<PerformanceInfo*>(0);`
`18095`	`18105`	`}`
`18096`	`18106`	`}`
`18097`		`-`
`18098`		`- static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
`18099`		`- {`
`18100`		`- try`
`18101`		`- {`
`18102`		`- return static_cast<Name*>(self)->Name::getPerfStats();`
`18103`		`- }`
`18104`		`- catch (...)`
`18105`		`- {`
`18106`		`- StatusType::catchException(0);`
`18107`		`- return static_cast<IPerformanceStats*>(0);`
`18108`		`- }`
`18109`		`- }`
`18110`	`18107`	`};`
`18111`	`18108`
`18112`	`18109`	`template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceStatement> > >`
`@@ -18124,7 +18121,6 @@ namespace Firebird`
`18124`	`18121`
`18125`	`18122`	`virtual ISC_INT64 getStmtID() = 0;`
`18126`	`18123`	`virtual PerformanceInfo* getPerf() = 0;`
`18127`		`- virtual IPerformanceStats* getPerfStats() = 0;`
`18128`	`18124`	`};`
`18129`	`18125`
`18130`	`18126`	`template <typename Name, typename StatusType, typename Base>`
`@@ -18142,12 +18138,12 @@ namespace Firebird`
`18142`	`18138`	`this->version = Base::VERSION;`
`18143`	`18139`	`this->getStmtID = &Name::cloopgetStmtIDDispatcher;`
`18144`	`18140`	`this->getPerf = &Name::cloopgetPerfDispatcher;`
`18145`		`- this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;`
`18146`	`18141`	`this->getText = &Name::cloopgetTextDispatcher;`
`18147`	`18142`	`this->getPlan = &Name::cloopgetPlanDispatcher;`
`18148`	`18143`	`this->getInputs = &Name::cloopgetInputsDispatcher;`
`18149`	`18144`	`this->getTextUTF8 = &Name::cloopgetTextUTF8Dispatcher;`
`18150`	`18145`	`this->getExplainedPlan = &Name::cloopgetExplainedPlanDispatcher;`
	`18146`	`+ this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;`
`18151`	`18147`	`}`
`18152`	`18148`	`} vTable;`
`18153`	`18149`
`@@ -18219,42 +18215,42 @@ namespace Firebird`
`18219`	`18215`	`}`
`18220`	`18216`	`}`
`18221`	`18217`
`18222`		`- static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
	`18218`	`+ static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT`
`18223`	`18219`	`{`
`18224`	`18220`	`try`
`18225`	`18221`	`{`
`18226`		`- return static_cast<Name*>(self)->Name::getStmtID();`
	`18222`	`+ return static_cast<Name*>(self)->Name::getPerfStats();`
`18227`	`18223`	`}`
`18228`	`18224`	`catch (...)`
`18229`	`18225`	`{`
`18230`	`18226`	`StatusType::catchException(0);`
`18231`		`- return static_cast<ISC_INT64>(0);`
	`18227`	`+ return static_cast<IPerformanceStats*>(0);`
`18232`	`18228`	`}`
`18233`	`18229`	`}`
`18234`	`18230`
`18235`		`- static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
	`18231`	`+ static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
`18236`	`18232`	`{`
`18237`	`18233`	`try`
`18238`	`18234`	`{`
`18239`		`- return static_cast<Name*>(self)->Name::getPerf();`
	`18235`	`+ return static_cast<Name*>(self)->Name::getStmtID();`
`18240`	`18236`	`}`
`18241`	`18237`	`catch (...)`
`18242`	`18238`	`{`
`18243`	`18239`	`StatusType::catchException(0);`
`18244`		`- return static_cast<PerformanceInfo*>(0);`
	`18240`	`+ return static_cast<ISC_INT64>(0);`
`18245`	`18241`	`}`
`18246`	`18242`	`}`
`18247`	`18243`
`18248`		`- static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
	`18244`	`+ static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
`18249`	`18245`	`{`
`18250`	`18246`	`try`
`18251`	`18247`	`{`
`18252`		`- return static_cast<Name*>(self)->Name::getPerfStats();`
	`18248`	`+ return static_cast<Name*>(self)->Name::getPerf();`
`18253`	`18249`	`}`
`18254`	`18250`	`catch (...)`
`18255`	`18251`	`{`
`18256`	`18252`	`StatusType::catchException(0);`
`18257`		`- return static_cast<IPerformanceStats*>(0);`
	`18253`	`+ return static_cast<PerformanceInfo*>(0);`
`18258`	`18254`	`}`
`18259`	`18255`	`}`
`18260`	`18256`	`};`
`@@ -18277,6 +18273,7 @@ namespace Firebird`
`18277`	`18273`	`virtual ITraceParams* getInputs() = 0;`
`18278`	`18274`	`virtual const char* getTextUTF8() = 0;`
`18279`	`18275`	`virtual const char* getExplainedPlan() = 0;`
	`18276`	`+ virtual IPerformanceStats* getPerfStats() = 0;`
`18280`	`18277`	`};`
`18281`	`18278`
`18282`	`18279`	`template <typename Name, typename StatusType, typename Base>`
`@@ -18294,10 +18291,10 @@ namespace Firebird`
`18294`	`18291`	`this->version = Base::VERSION;`
`18295`	`18292`	`this->getStmtID = &Name::cloopgetStmtIDDispatcher;`
`18296`	`18293`	`this->getPerf = &Name::cloopgetPerfDispatcher;`
`18297`		`- this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;`
`18298`	`18294`	`this->getData = &Name::cloopgetDataDispatcher;`
`18299`	`18295`	`this->getDataLength = &Name::cloopgetDataLengthDispatcher;`
`18300`	`18296`	`this->getText = &Name::cloopgetTextDispatcher;`
	`18297`	`+ this->getPerfStats = &Name::cloopgetPerfStatsDispatcher;`
`18301`	`18298`	`}`
`18302`	`18299`	`} vTable;`
`18303`	`18300`
`@@ -18343,42 +18340,42 @@ namespace Firebird`
`18343`	`18340`	`}`
`18344`	`18341`	`}`
`18345`	`18342`
`18346`		`- static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
	`18343`	`+ static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceBLRStatement* self) CLOOP_NOEXCEPT`
`18347`	`18344`	`{`
`18348`	`18345`	`try`
`18349`	`18346`	`{`
`18350`		`- return static_cast<Name*>(self)->Name::getStmtID();`
	`18347`	`+ return static_cast<Name*>(self)->Name::getPerfStats();`
`18351`	`18348`	`}`
`18352`	`18349`	`catch (...)`
`18353`	`18350`	`{`
`18354`	`18351`	`StatusType::catchException(0);`
`18355`		`- return static_cast<ISC_INT64>(0);`
	`18352`	`+ return static_cast<IPerformanceStats*>(0);`
`18356`	`18353`	`}`
`18357`	`18354`	`}`
`18358`	`18355`
`18359`		`- static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
	`18356`	`+ static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
`18360`	`18357`	`{`
`18361`	`18358`	`try`
`18362`	`18359`	`{`
`18363`		`- return static_cast<Name*>(self)->Name::getPerf();`
	`18360`	`+ return static_cast<Name*>(self)->Name::getStmtID();`
`18364`	`18361`	`}`
`18365`	`18362`	`catch (...)`
`18366`	`18363`	`{`
`18367`	`18364`	`StatusType::catchException(0);`
`18368`		`- return static_cast<PerformanceInfo*>(0);`
	`18365`	`+ return static_cast<ISC_INT64>(0);`
`18369`	`18366`	`}`
`18370`	`18367`	`}`
`18371`	`18368`
`18372`		`- static IPerformanceStats* CLOOP_CARG cloopgetPerfStatsDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
	`18369`	`+ static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT`
`18373`	`18370`	`{`
`18374`	`18371`	`try`
`18375`	`18372`	`{`
`18376`		`- return static_cast<Name*>(self)->Name::getPerfStats();`
	`18373`	`+ return static_cast<Name*>(self)->Name::getPerf();`
`18377`	`18374`	`}`
`18378`	`18375`	`catch (...)`
`18379`	`18376`	`{`
`18380`	`18377`	`StatusType::catchException(0);`
`18381`		`- return static_cast<IPerformanceStats*>(0);`
	`18378`	`+ return static_cast<PerformanceInfo*>(0);`
`18382`	`18379`	`}`
`18383`	`18380`	`}`
`18384`	`18381`	`};`
`@@ -18399,6 +18396,7 @@ namespace Firebird`
`18399`	`18396`	`virtual const unsigned char* getData() = 0;`
`18400`	`18397`	`virtual unsigned getDataLength() = 0;`
`18401`	`18398`	`virtual const char* getText() = 0;`
	`18399`	`+ virtual IPerformanceStats* getPerfStats() = 0;`
`18402`	`18400`	`};`
`18403`	`18401`
`18404`	`18402`	`template <typename Name, typename StatusType, typename Base>`