Check for sentinels regardless of AcceptsError

enso-org · Apr 18, 2022 · 8c6886f · 8c6886f
1 parent bdbebae
commit 8c6886f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java
@@ -125,11 +125,14 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
       for (MethodDefinition.ArgumentDefinition arg : methodDefinition.getArguments()) {
         if (arg.shouldCheckErrors()) {
           String condName = mkArgumentInternalVarName(arg) + DATAFLOW_ERROR_PROFILE;
-          String branchName = mkArgumentInternalVarName(arg) + PANIC_SENTINEL_PROFILE;
           out.println(
               "  private final ConditionProfile "
                   + condName
                   + " = ConditionProfile.createCountingProfile();");
+        }
+
+        if (arg.isPositional() && !arg.isThis()) {
+          String branchName = mkArgumentInternalVarName(arg) + PANIC_SENTINEL_PROFILE;
           out.println("  private final BranchProfile " + branchName + " = BranchProfile.create();");
         }
 
@@ -270,8 +273,8 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
 
   private void generateArgumentRead(
       PrintWriter out, MethodDefinition.ArgumentDefinition arg, String argsArray) {
+    String argReference = argsArray + "[" + arg.getPosition() + "]";
     if (arg.shouldCheckErrors()) {
-      String argReference = argsArray + "[" + arg.getPosition() + "]";
       String condProfile = mkArgumentInternalVarName(arg) + DATAFLOW_ERROR_PROFILE;
       out.println(
           "    if ("
@@ -283,9 +286,11 @@ private void generateArgumentRead(
               + argReference
               + ");\n"
               + "    }");
+    }
+    if (!arg.isThis()) {
       String branchProfile = mkArgumentInternalVarName(arg) + PANIC_SENTINEL_PROFILE;
       out.println(
-          "    else if (TypesGen.isPanicSentinel("
+          "    if (TypesGen.isPanicSentinel("
               + argReference
               + ")) {\n"
               + "      "
@@ -366,7 +371,9 @@ private void generateCheckedArgumentRead(
   private boolean generateWarningsCheck(
       PrintWriter out, List<MethodDefinition.ArgumentDefinition> arguments, String argumentsArray) {
     List<MethodDefinition.ArgumentDefinition> argsToCheck =
-        arguments.stream().filter(ArgumentDefinition::shouldCheckWarnings).collect(Collectors.toList());
+        arguments.stream()
+            .filter(ArgumentDefinition::shouldCheckWarnings)
+            .collect(Collectors.toList());
     if (argsToCheck.isEmpty()) {
       return false;
     } else {