@@ -520,8 +520,7 @@ private class NonPublicMethodCharacteristic extends CharacteristicsImpl::Uninter
520520 NonPublicMethodCharacteristic ( ) { this = "non-public method" }
521521
522522 override predicate appliesToEndpoint ( Endpoint e ) {
523- e .getExtensibleType ( ) = "sinkModel" and
524- not e .getCallable ( ) .isPublic ( )
523+ exists ( Callable c | c = e .getCallable ( ) | not c .isPublic ( ) )
525524 }
526525}
527526
@@ -543,7 +542,6 @@ private class OtherArgumentToModeledMethodCharacteristic extends Characteristics
543542 }
544543
545544 override predicate appliesToEndpoint ( Endpoint e ) {
546- e .getExtensibleType ( ) = "sinkModel" and
547545 not ApplicationCandidatesImpl:: isSink ( e , _, _) and
548546 exists ( CallArgument otherSink |
549547 ApplicationCandidatesImpl:: isSink ( otherSink , _, "manual" ) and
@@ -562,7 +560,6 @@ private class FunctionValueCharacteristic extends CharacteristicsImpl::LikelyNot
562560 FunctionValueCharacteristic ( ) { this = "function value" }
563561
564562 override predicate appliesToEndpoint ( Endpoint e ) {
565- e .getExtensibleType ( ) = "sinkModel" and
566563 e .asNode ( ) .asExpr ( ) instanceof FunctionalExpr
567564 }
568565}
@@ -579,7 +576,6 @@ private class CannotBeTaintedCharacteristic extends CharacteristicsImpl::LikelyN
579576 CannotBeTaintedCharacteristic ( ) { this = "cannot be tainted" }
580577
581578 override predicate appliesToEndpoint ( Endpoint e ) {
582- e .getExtensibleType ( ) = "sinkModel" and
583579 not this .isKnownOutNodeForStep ( e )
584580 }
585581
0 commit comments