@@ -483,7 +483,6 @@ module FinallySplitting {
483483 */
484484 class FinallySplitImpl extends SplitImpl , TFinallySplit {
485485 private FinallySplitType type ;
486-
487486 private int nestLevel ;
488487
489488 FinallySplitImpl ( ) { this = TFinallySplit ( type , nestLevel ) }
@@ -553,10 +552,10 @@ module FinallySplitting {
553552
554553 /**
555554 * Holds if `pred` may exit this split with completion `c`. The Boolean
556- * `derived ` indicates whether `c` is a derived completion from a `try`/
555+ * `inherited ` indicates whether `c` is an inherited completion from a `try`/
557556 * `catch` block.
558557 */
559- private predicate exit ( ControlFlowElement pred , Completion c , boolean derived ) {
558+ private predicate exit ( ControlFlowElement pred , Completion c , boolean inherited ) {
560559 this .appliesToPredecessor ( pred ) and
561560 exists ( TryStmt try , FinallySplitType type |
562561 type = this .getType ( ) and
@@ -568,7 +567,7 @@ module FinallySplitting {
568567 // Finally block can itself exit with completion `c`: either `c` must
569568 // match this split, `c` must be an abnormal completion, or this split
570569 // does not require another completion to be recovered
571- derived = false and
570+ inherited = false and
572571 (
573572 type .matchesCompletion ( c )
574573 or
@@ -577,15 +576,15 @@ module FinallySplitting {
577576 type instanceof NormalSuccessor
578577 )
579578 else (
580- // Finally block can exit with completion `c` derived from try/catch
579+ // Finally block can exit with completion `c` inherited from try/catch
581580 // block: must match this split
582- derived = true and
581+ inherited = true and
583582 type .matchesCompletion ( c ) and
584583 not type instanceof NormalSuccessor
585584 )
586585 )
587586 or
588- // If this split is normal, and an outer split can exit based on a derived
587+ // If this split is normal, and an outer split can exit based on a inherited
589588 // completion, we need to exit this split as well. For example, in
590589 //
591590 // ```
@@ -613,9 +612,9 @@ module FinallySplitting {
613612 this .appliesToPredecessor ( pred ) and
614613 exists ( FinallySplitInternal outer |
615614 outer .getNestLevel ( ) = this .getNestLevel ( ) - 1 and
616- outer .exit ( pred , c , derived ) and
615+ outer .exit ( pred , c , inherited ) and
617616 this .getType ( ) instanceof NormalSuccessor and
618- derived = true
617+ inherited = true
619618 )
620619 }
621620
0 commit comments