@@ -697,6 +697,7 @@ const StmtNode* BlockNode::execute(thread_db* tdbb, Request* request, ExeState*
697
697
transaction->releaseSavepoint (tdbb);
698
698
}
699
699
}
700
+ return parentStmt;
700
701
701
702
default :
702
703
return parentStmt;
@@ -908,7 +909,7 @@ const StmtNode* CompoundStmtNode::execute(thread_db* tdbb, Request* request, Exe
908
909
{
909
910
case Request::req_evaluate:
910
911
impure->sta_state = 0 ;
911
- // fall into
912
+ [[fallthrough]];
912
913
913
914
case Request::req_return:
914
915
case Request::req_sync:
@@ -918,7 +919,7 @@ const StmtNode* CompoundStmtNode::execute(thread_db* tdbb, Request* request, Exe
918
919
return statements[impure->sta_state ++];
919
920
}
920
921
request->req_operation = Request::req_return;
921
- // fall into
922
+ return parentStmt;
922
923
923
924
default :
924
925
return parentStmt;
@@ -1003,7 +1004,7 @@ DmlNode* CursorStmtNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratc
1003
1004
case blr_cursor_fetch_scroll:
1004
1005
node->scrollOp = csb->csb_blr_reader .getByte ();
1005
1006
node->scrollExpr = PAR_parse_value (tdbb, csb);
1006
- // fall into
1007
+ [[fallthrough]];
1007
1008
1008
1009
case blr_cursor_fetch:
1009
1010
csb->csb_g_flags |= csb_reuse_context;
@@ -1226,6 +1227,7 @@ const StmtNode* CursorStmtNode::execute(thread_db* tdbb, Request* request, ExeSt
1226
1227
}
1227
1228
1228
1229
request->req_operation = Request::req_return;
1230
+ return parentStmt;
1229
1231
1230
1232
default :
1231
1233
return parentStmt;
@@ -5854,13 +5856,13 @@ const StmtNode* ForNode::execute(thread_db* tdbb, Request* request, ExeState* /*
5854
5856
if (cursor->isUpdateCounters ())
5855
5857
request->req_records_affected .clear ();
5856
5858
5857
- // fall into
5859
+ [[fallthrough]];
5858
5860
5859
5861
case Request::req_return:
5860
5862
if (stall)
5861
5863
return stall;
5862
5864
5863
- // fall into
5865
+ [[fallthrough]];
5864
5866
5865
5867
case Request::req_sync:
5866
5868
{
@@ -5907,7 +5909,7 @@ const StmtNode* ForNode::execute(thread_db* tdbb, Request* request, ExeState* /*
5907
5909
}
5908
5910
}
5909
5911
5910
- // fall into
5912
+ [[fallthrough]];
5911
5913
5912
5914
default :
5913
5915
{
@@ -6224,9 +6226,8 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat
6224
6226
request->req_operation = Request::req_return;
6225
6227
return parentStmt;
6226
6228
}
6227
-
6228
- [[fallthrough]];
6229
6229
}
6230
+ [[fallthrough]];
6230
6231
6231
6232
case Request::req_return:
6232
6233
case Request::req_sync:
@@ -6344,6 +6345,7 @@ const StmtNode* HandlerNode::execute(thread_db* /*tdbb*/, Request* request, ExeS
6344
6345
case Request::req_unwind:
6345
6346
if (!request->req_label )
6346
6347
request->req_operation = Request::req_return;
6348
+ return parentStmt;
6347
6349
6348
6350
default :
6349
6351
return parentStmt;
@@ -6411,7 +6413,7 @@ const StmtNode* LabelNode::execute(thread_db* /*tdbb*/, Request* request, ExeSta
6411
6413
request->req_flags &= ~req_leave;
6412
6414
request->req_operation = Request::req_return;
6413
6415
}
6414
- // fall into
6416
+ return parentStmt;
6415
6417
6416
6418
default :
6417
6419
return parentStmt;
@@ -6700,7 +6702,7 @@ const StmtNode* LoopNode::execute(thread_db* /*tdbb*/, Request* request, ExeStat
6700
6702
request->req_operation = Request::req_evaluate;
6701
6703
return statement;
6702
6704
}
6703
- // fall into
6705
+ return parentStmt;
6704
6706
}
6705
6707
6706
6708
default :
@@ -8218,9 +8220,9 @@ const StmtNode* ModifyNode::modify(thread_db* tdbb, Request* request, WhichTrigg
8218
8220
8219
8221
if (impure->sta_state == 0 && forNode && forNode->isWriteLockMode (request))
8220
8222
request->req_operation = Request::req_return;
8221
- // fall thru
8222
8223
else
8223
8224
break ;
8225
+ [[fallthrough]];
8224
8226
8225
8227
case Request::req_return:
8226
8228
if (impure->sta_state == 1 )
@@ -8334,6 +8336,7 @@ const StmtNode* ModifyNode::modify(thread_db* tdbb, Request* request, WhichTrigg
8334
8336
orgRpb->rpb_record = newRpb->rpb_record ;
8335
8337
newRpb->rpb_record = orgRecord;
8336
8338
}
8339
+ return parentStmt;
8337
8340
8338
8341
default :
8339
8342
return parentStmt;
@@ -8668,7 +8671,7 @@ const StmtNode* ReceiveNode::execute(thread_db* /*tdbb*/, Request* request, ExeS
8668
8671
case Request::req_return:
8669
8672
if (!(request->req_batch_mode && batchFlag))
8670
8673
break ;
8671
- // fall into
8674
+ [[fallthrough]];
8672
8675
8673
8676
case Request::req_evaluate:
8674
8677
request->req_operation = Request::req_receive;
@@ -9376,7 +9379,7 @@ const StmtNode* StoreNode::store(thread_db* tdbb, Request* request, WhichTrigger
9376
9379
return statement2;
9377
9380
}
9378
9381
}
9379
- // fall into
9382
+ return parentStmt;
9380
9383
9381
9384
default :
9382
9385
return parentStmt;
@@ -10281,7 +10284,7 @@ void SetDecFloatTrapsNode::execute(thread_db* tdbb, DsqlRequest* /*request*/, jr
10281
10284
10282
10285
SessionManagementNode* SetBindNode::dsqlPass (DsqlCompilerScratch* dsqlScratch)
10283
10286
{
10284
- static const USHORT NON_FIELD_MASK = FLD_legacy | FLD_native;
10287
+ static constexpr USHORT NON_FIELD_MASK = FLD_legacy | FLD_native;
10285
10288
10286
10289
from->resolve (dsqlScratch);
10287
10290
if (!(to->flags & NON_FIELD_MASK))
@@ -11363,6 +11366,9 @@ static VariableNode* dsqlPassHiddenVariable(DsqlCompilerScratch* dsqlScratch, Va
11363
11366
case ExprNode::TYPE_RECORD_KEY:
11364
11367
case ExprNode::TYPE_VARIABLE:
11365
11368
return NULL ;
11369
+ default :
11370
+ // create temporary value below
11371
+ break ;
11366
11372
}
11367
11373
11368
11374
VariableNode* varNode = FB_NEW_POOL (*tdbb->getDefaultPool ()) VariableNode (*tdbb->getDefaultPool ());
@@ -11687,6 +11693,9 @@ static void dsqlSetParameterName(DsqlCompilerScratch* dsqlScratch, ExprNode* exp
11687
11693
parameter->par_rel_name = relation->rel_name ;
11688
11694
break ;
11689
11695
}
11696
+
11697
+ default :
11698
+ break ;
11690
11699
}
11691
11700
}
11692
11701
0 commit comments