Correctly replacing ast node of constructor and method scopes

Fraunhofer-AISEC · Jul 30, 2020 · 0e1d586 · 0e1d586
1 parent eb7f68b
commit 0e1d586
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/src/main/java/de/fraunhofer/aisec/cpg/frontends/cpp/DeclaratorHandler.java b/src/main/java/de/fraunhofer/aisec/cpg/frontends/cpp/DeclaratorHandler.java
@@ -45,7 +45,6 @@
 import de.fraunhofer.aisec.cpg.graph.type.TypeParser;
 import de.fraunhofer.aisec.cpg.graph.type.UnknownType;
 import de.fraunhofer.aisec.cpg.passes.scopes.RecordScope;
-import de.fraunhofer.aisec.cpg.passes.scopes.Scope;
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -337,8 +336,6 @@ private void processMembers(
 
       Declaration declaration = lang.getDeclarationHandler().handle(member);
 
-      Scope declarationScope = lang.getScopeManager().getScopeOfStatment(declaration);
-
       if (declaration instanceof FunctionDeclaration) {
         MethodDeclaration method =
             MethodDeclaration.from((FunctionDeclaration) declaration, recordDeclaration);
@@ -347,10 +344,7 @@ private void processMembers(
         // check, if its a constructor
         if (declaration.getName().equals(recordDeclaration.getName())) {
           ConstructorDeclaration constructor = ConstructorDeclaration.from(method);
-          if (declarationScope != null) {
-            declarationScope.setAstNode(
-                constructor); // Adjust cpg Node by which scopes are identified
-          }
+
           Type type =
               TypeParser.createFrom(
                   lang.getScopeManager()
@@ -369,10 +363,6 @@ private void processMembers(
           // update scope manager, otherwise we point at the old function declaration
           this.lang.getScopeManager().replaceNode(method, declaration);
         }
-
-        if (declarationScope != null) {
-          declarationScope.setAstNode(method); // Adjust cpg Node by which scopes are identified
-        }
       } else if (declaration instanceof VariableDeclaration) {
         FieldDeclaration fieldDeclaration =
             FieldDeclaration.from((VariableDeclaration) declaration);