Skip to content

Added exception handling around method/constructor call resolution #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Added exception handling around method/constructor call resolution #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/main/java/com/ibm/northstar/SymbolTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import com.github.javaparser.ast.stmt.BlockStmt;
import com.github.javaparser.ast.type.ReferenceType;
import com.github.javaparser.ast.type.Type;
import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.JavaSymbolSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
Expand Down Expand Up @@ -491,14 +489,21 @@ private static List<CallSite> getCallSites(Optional<BlockStmt> callableBody) {
} else {
returnType = resolveExpression(methodCallExpr);
}
ResolvedMethodDeclaration resolvedMethodDeclaration = methodCallExpr.resolve();

// resolve callee and get signature
String calleeSignature = "";
try {
calleeSignature = methodCallExpr.resolve().getSignature();
} catch (RuntimeException exception) {
Log.debug("Could not resolve method call: " + methodCallExpr + ": " + exception.getMessage());
}

// resolve arguments of the method call to types
List<String> arguments = methodCallExpr.getArguments().stream()
.map(SymbolTable::resolveExpression).collect(Collectors.toList());
// add a new call site object
callSites.add(createCallSite(methodCallExpr, methodCallExpr.getNameAsString(), receiverName, declaringType,
arguments, returnType, resolvedMethodDeclaration.getSignature(), isStaticCall, false));
arguments, returnType, calleeSignature, isStaticCall, false));
}

for (ObjectCreationExpr objectCreationExpr : callableBody.get().findAll(ObjectCreationExpr.class)) {
Expand All @@ -509,13 +514,18 @@ private static List<CallSite> getCallSites(Optional<BlockStmt> callableBody) {
List<String> arguments = objectCreationExpr.getArguments().stream()
.map(SymbolTable::resolveExpression).collect(Collectors.toList());

ResolvedConstructorDeclaration resolvedConstructorDeclaration = objectCreationExpr.resolve();
// resolve callee and get signature
String calleeSignature = "";
try {
calleeSignature = objectCreationExpr.resolve().getSignature();
} catch (RuntimeException exception) {
Log.debug("Could not resolve constructor call: " + objectCreationExpr + ": " + exception.getMessage());
}

// add a new call site object
callSites.add(createCallSite(objectCreationExpr, "<init>",
objectCreationExpr.getScope().isPresent() ? objectCreationExpr.getScope().get().toString() : "",
instantiatedType, arguments, instantiatedType, resolvedConstructorDeclaration.getSignature(),
false, true));
instantiatedType, arguments, instantiatedType, calleeSignature,false, true));
}

return callSites;
Expand Down