Postfix for #8499 - fix problems with BLR to source mapping and profiler.

Thanks to Pavel Zotov for reporting.

Author: asfernandes

src/dsql/Nodes.h

@@ -1501,15 +1501,7 @@ class StmtNode : public DmlNode
 			: savedTdbb(tdbb),
 			  oldPool(tdbb->getDefaultPool()),
 			  oldRequest(tdbb->getRequest()),
-			  oldTransaction(tdbb->getTransaction()),
-			  topNode(NULL),
-			  prevNode(NULL),
-			  whichEraseTrig(ALL_TRIGS),
-			  whichStoTrig(ALL_TRIGS),
-			  whichModTrig(ALL_TRIGS),
-			  errorPending(false),
-			  catchDisabled(false),
-			  exit(false)
+			  oldTransaction(tdbb->getTransaction())
 		{
 			savedTdbb->setTransaction(transaction);
 			savedTdbb->setRequest(request);
@@ -1525,14 +1517,15 @@ class StmtNode : public DmlNode
 		MemoryPool* oldPool;		// Save the old pool to restore on exit.
 		Request* oldRequest;		// Save the old request to restore on exit.
 		jrd_tra* oldTransaction;	// Save the old transcation to restore on exit.
-		const StmtNode* topNode;
-		const StmtNode* prevNode;
-		WhichTrigger whichEraseTrig;
-		WhichTrigger whichStoTrig;
-		WhichTrigger whichModTrig;
-		bool errorPending;			// Is there an error pending to be handled?
-		bool catchDisabled;			// Catch errors so we can unwind cleanly.
-		bool exit;					// Exit the looper when true.
+		const StmtNode* topNode = nullptr;
+		const StmtNode* prevNode = nullptr;
+		WhichTrigger whichEraseTrig = ALL_TRIGS;
+		WhichTrigger whichStoTrig = ALL_TRIGS;
+		WhichTrigger whichModTrig = ALL_TRIGS;
+		bool errorPending = false;		// Is there an error pending to be handled?
+		bool catchDisabled = false;		// Catch errors so we can unwind cleanly.
+		bool exit = false;				// Exit the looper when true.
+		bool forceProfileNextEvaluate = false;
 	};
 
 public:

src/dsql/StmtNodes.cpp

@@ -5998,6 +5998,10 @@ void ForRangeNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	dsqlScratch->appendUChar(blr_label);
 	fb_assert(dsqlLabelNumber < MAX_UCHAR);
 	dsqlScratch->appendUChar((UCHAR) dsqlLabelNumber);
+
+	if (hasLineColumn)
+		dsqlScratch->putDebugSrcInfo(line, column);
+
 	dsqlScratch->appendUChar(blr_for_range);
 
 	dsqlScratch->appendUChar(blr_for_range_variable);
@@ -6072,7 +6076,7 @@ ForRangeNode* ForRangeNode::pass2(thread_db* tdbb, CompilerScratch* csb)
 	return this;
 }
 
-const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeState* /*exeState*/) const
+const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeState* exeState) const
 {
 	const auto impure = request->getImpure<Impure>(impureOffset);
 
@@ -6162,6 +6166,7 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat
 				return parentStmt;
 			}
 
+			exeState->forceProfileNextEvaluate = true;
 			request->req_operation = Request::req_evaluate;
 			return statement;
 		}

src/jrd/exe.cpp

@@ -1704,12 +1704,14 @@ const StmtNode* EXE_looper(thread_db* tdbb, Request* request, const StmtNode* no
 
 					if (node->hasLineColumn &&
 						node->isProfileAware() &&
-						(!profileNode ||
+						(exeState.forceProfileNextEvaluate ||
+						 !profileNode ||
 						 !(node->line == profileNode->line && node->column == profileNode->column)))
 					{
 						profilerLastTicks = profilerCallAfterPsqlLineColumn();
 						profilerLastAccumulatedOverhead = profilerManager->getAccumulatedOverhead();
 						profileNode = node;
+						exeState.forceProfileNextEvaluate = false;
 
 						profilerManager->beforePsqlLineColumn(request, profileNode->line, profileNode->column);
 					}