Skip to content

Commit 47fcbdd

Browse files
Jami Cogswellatorralba
authored andcommitted
resolve merge conflict
1 parent d07babe commit 47fcbdd

File tree

12 files changed

+198
-358
lines changed

12 files changed

+198
-358
lines changed

java/ql/lib/semmle/code/java/Expr.qll

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,23 +1316,6 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {
13161316
result = this.getAnArgument()
13171317
}
13181318

1319-
// ! remove below predicate after experimentation
1320-
/**
1321-
* Gets the argument provided to the constructor of this class instance creation expression
1322-
* of the specified Type.
1323-
*/
1324-
Expr getArgumentByType(Type type) {
1325-
exists(Argument arg |
1326-
arg = this.getAnArgument() and
1327-
arg.getType() = type and
1328-
result = arg
1329-
)
1330-
// ! e.g. use above in below code in `StartActivityIntentStep` in Intent.qll
1331-
// argType.getName().matches("Class<%>") and
1332-
// newIntent.getArgumentByType(argType).getType().(ParameterizedType).getATypeArgument() =
1333-
// getIntent.getReceiverType() and
1334-
}
1335-
13361319
/**
13371320
* Gets a type argument provided to the constructor of this class instance creation expression.
13381321
*

java/ql/lib/semmle/code/java/frameworks/android/DeepLink.qll

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)