[Spec tests] Fix test-info parser for relevant places

compiler/tests-spec/testData/codegen/box/linked/exceptions/catching-exceptions/testsMap.json

@@ -0,0 +1,26 @@
+{
+  "4": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "If an exception was thrown, but no catch block matched its type, the finally block is evaluated before propagating the exception up the call stack",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/try-expression/p-5/neg/3.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "If an exception was thrown, but no catch block matched its type, the finally block is evaluated before propagating the exception up the call stack",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/try-expression/p-5/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}

compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/testsMap.json

@@ -20,6 +20,42 @@
     }
   },
   "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A - B is exactly the same as A.MINUS(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/p-2/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A + B is exactly the same as A.plus(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A - B is exactly the same as A.MINUS(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/p-2/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A + B is exactly the same as A.plus(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
     "pos": {
       "1": [
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/testsMap.json

@@ -58,5 +58,111 @@
         }
       ]
     }
+  },
+  "2": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "4": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/codegen/box/linked/expressions/elvis-operator-expression/testsMap.json

@@ -19,5 +19,18 @@
         }
       ]
     }
+  },
+  "2": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "Check Elvis evaluation",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/elvis-operator-expression/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/codegen/box/linked/expressions/equality-expressions/reference-equality-expressions/testsMap.json

@@ -84,5 +84,18 @@
         }
       ]
     }
+  },
+  "2": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check if two values are equal (\u003d\u003d\u003d) by reference",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/equality-expressions/reference-equality-expressions/p-1/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/codegen/box/linked/expressions/indexing-expressions/testsMap.json

@@ -75,5 +75,46 @@
         }
       ]
     }
+  },
+  "2": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "A[I_0,I_1,...,I_N] is exactly the same as A.get(I_0,I_1,...,I_N), where get is a valid operator function available in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/indexing-expressions/p-3/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "A[I_0,I_1,...,I_N] is exactly the same as A.get(I_0,I_1,...,I_N), where get is a valid operator function available in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/indexing-expressions/p-3/pos/1.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "A[I_0,I_1,...,I_N] is exactly the same as A.get(I_0,I_1,...,I_N), where get is a valid operator function available in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/indexing-expressions/p-3/pos/1.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "A[I_0,I_1,...,I_N] is exactly the same as A.get(I_0,I_1,...,I_N), where get is a valid operator function available in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/indexing-expressions/p-3/pos/1.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "A[I_0,I_1,...,I_N] is exactly the same as A.get(I_0,I_1,...,I_N), where get is a valid operator function available in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/indexing-expressions/p-3/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/testsMap.json

@@ -32,6 +32,70 @@
     }
   },
   "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled break expression, denoted break@Loop, where Loop is a label of a labeled loop statement L, which continue-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple break expression, specified using the continue keyword, which break-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled break expression, denoted break@Loop, where Loop is a label of a labeled loop statement L, which break-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple break expression, specified using the break keyword, which break-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled break expression, denoted break@Loop, where Loop is a label of a labeled loop statement L, which continue-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple break expression, specified using the continue keyword, which break-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled break expression, denoted break@Loop, where Loop is a label of a labeled loop statement L, which break-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple break expression, specified using the break keyword, which break-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
     "pos": {
       "1": [
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/testsMap.json

@@ -32,6 +32,70 @@
     }
   },
   "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled continue expression, denoted continue@Loop, where Loop is a label of a labeled loop statement L, which continue-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple continue expression, specified using the continue keyword, which continue-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled continue expression, denoted continue@Loop, where Loop is a label of a labeled loop statement L, which continue-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple continue expression, specified using the continue keyword, which continue-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled continue expression, denoted continue@Loop, where Loop is a label of a labeled loop statement L, which continue-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple continue expression, specified using the continue keyword, which continue-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A labeled continue expression, denoted continue@Loop, where Loop is a label of a labeled loop statement L, which continue-jumps to the loop L.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple continue expression, specified using the continue keyword, which continue-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/continue-expression/p-3/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
     "pos": {
       "1": [
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/testsMap.json

@@ -42,12 +42,33 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-1/pos/1.2.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-1/pos/1.3.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-222",
           "casesNumber": 0,
           "description": "",
           "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-1/pos/1.1.kt",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "If several declarations match one name, the return is considered to be from the nearest matching function;",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-3/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "If return@Context is inside a lambda expression body, the name of the function using this lambda expression as its argument may be used as Context to refer to the lambda literal itself",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-3/pos/3.1.kt",
+          "unexpectedBehaviour": false
         }
       ]
     }
@@ -60,9 +81,23 @@
           "casesNumber": 0,
           "description": "If several declarations match one name, the return is considered to be from the nearest matching function;",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "If return@Context is inside a lambda expression body, the name of the function using this lambda expression as its argument may be used as Context to refer to the lambda literal itself",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-3/pos/3.1.kt",
+          "unexpectedBehaviour": false
         }
       ],
       "3": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "If several declarations match one name, the return is considered to be from the nearest matching function;",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-3/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-313",
           "casesNumber": 0,

compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/testsMap.json

@@ -51,6 +51,29 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/1.1.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A / B is exactly the same as A.div(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A % B is exactly the same as A.rem(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A * B is exactly the same as A.times(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   }

compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/logical-not-expression/testsMap.json

@@ -12,6 +12,28 @@
     }
   },
   "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/logical-not-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/logical-not-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
     "pos": {
       "1": [
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-minus-expression/testsMap.json

@@ -21,6 +21,28 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-minus-expression/p-2/pos/1.1.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "exactly the same as A.unaryMinus() where unaryMinus is a valid operator function available in the current scope.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-minus-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "exactly the same as A.unaryMinus() where unaryMinus is a valid operator function available in the current scope.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-minus-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   }

compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-plus-expression/testsMap.json

@@ -12,6 +12,28 @@
     }
   },
   "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "+A is exactly the same as A.unaryPlus() where unaryMinus is a valid operator function available in the current scope.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-plus-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "+A is exactly the same as A.unaryPlus() where unaryMinus is a valid operator function available in the current scope.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/unary-plus-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
     "pos": {
       "1": [
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/range-expression/testsMap.json

@@ -12,6 +12,28 @@
     }
   },
   "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A..B is exactly the same as A.rangeTo(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/range-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A..B is exactly the same as A.rangeTo(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/range-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
     "pos": {
       "1": [
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/testsMap.json

@@ -48,6 +48,70 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-2/pos/1.1.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-4/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-4/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-2/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-4/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-4/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-2/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": " A in B is exactly the same as B.contains(A);",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   },

compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/testsMap.json

@@ -64,5 +64,157 @@
         }
       ]
     }
+  },
+  "4": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Extension callables, declared in the package scope, for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Star-imported extension callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Non-extension member callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Star-imported extension callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.10.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Explicitly imported extension callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.8.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Extension callables, declared in the package scope, for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.9.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Non-extension member callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.6.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Local extension callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Explicitly imported extension callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "local extension callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.7.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Extension callables, declared in the package scope, for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Star-imported extension callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Non-extension member callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Star-imported extension callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.10.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Explicitly imported extension callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.8.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Extension callables, declared in the package scope, for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.9.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Non-extension member callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.6.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Local extension callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "Explicitly imported extension callables for for-loop operator iterator call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "local extension callables for delegated properties call",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.7.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/testsMap.json

@@ -112,7 +112,46 @@
           "unexpectedBehaviour": false
         }
       ],
+      "7": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.6.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.7.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.5.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "6": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
         {
           "specVersion": "0.1-268",
           "casesNumber": 0,
@@ -129,6 +168,47 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.10.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "9": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.10.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "8": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.8.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.9.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "10": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.9.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 0,
+          "description": "function-like prio is higher than property-like callables",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/overload-resolution/callables-and-invoke-convention/p-5/pos/1.4.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   }

compiler/tests-spec/testData/codegen/box/linked/overloadable-operators/testsMap.json

@@ -0,0 +1,183 @@
+{
+  "4": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003c\u003d B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "These operators are overloadable (A \u003e B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/comparison-expressions/p-1/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "check postfix increment expression has the same type as its operand expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": " check postfix increment expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix increment expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix increment expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression has the same type as its operand expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression has the same type as its operand expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A - B is exactly the same as A.MINUS(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/p-2/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A + B is exactly the same as A.plus(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A / B is exactly the same as A.div(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A % B is exactly the same as A.rem(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 0,
+          "description": "A * B is exactly the same as A.times(B)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/multiplicative-expression/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "A prefix decrement expression is an expression which uses the prefix form of operator --",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}

compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/testsMap.json

@@ -31,6 +31,15 @@
           "unexpectedBehaviour": false
         }
       ],
+      "3": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A +\u003d B is exactly the same as A.plusAssign(B) or A \u003d A.plus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/1.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "10": [
         {
           "specVersion": "0.1-222",
@@ -61,6 +70,15 @@
           "unexpectedBehaviour": false
         }
       ],
+      "12": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A /\u003d B is exactly the same as A.divAssign(B) or A \u003d A.div(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/10.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "13": [
         {
           "specVersion": "0.1-222",
@@ -121,6 +139,15 @@
           "unexpectedBehaviour": false
         }
       ],
+      "9": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A *\u003d B is exactly the same as A.timesAssign(B) or A \u003d A.times(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/7.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "4": [
         {
           "specVersion": "0.1-253",
@@ -150,6 +177,24 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/4.2.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "6": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 0,
+          "description": "A -\u003d B is exactly the same as A.minusAssign(B) or A \u003d A.minus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/4.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "15": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A %\u003d B is exactly the same as A.remAssign(B) or A \u003d A.rem(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/13.2.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     },
     "pos": {
@@ -183,6 +228,15 @@
           "unexpectedBehaviour": false
         }
       ],
+      "3": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A +\u003d B is exactly the same as A.plusAssign(B) or A \u003d A.plus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "10": [
         {
           "specVersion": "0.1-222",
@@ -213,6 +267,15 @@
           "unexpectedBehaviour": false
         }
       ],
+      "12": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A /\u003d B is exactly the same as A.divAssign(B) or A \u003d A.div(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/10.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "13": [
         {
           "specVersion": "0.1-222",
@@ -273,6 +336,22 @@
           "unexpectedBehaviour": false
         }
       ],
+      "9": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A *\u003d B is exactly the same as A.timesAssign(B) or A \u003d A.times(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/7.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A *\u003d B is exactly the same as A.timesAssign(B) or A \u003d A.times(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/7.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "4": [
         {
           "specVersion": "0.1-253",
@@ -302,6 +381,95 @@
           "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/4.2.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "15": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A %\u003d B is exactly the same as A.remAssign(B) or A \u003d A.rem(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/13.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A +\u003d B is exactly the same as A.plusAssign(B) or A \u003d A.plus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A /\u003d B is exactly the same as A.divAssign(B) or A \u003d A.div(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/10.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A *\u003d B is exactly the same as A.timesAssign(B) or A \u003d A.times(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/7.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 0,
+          "description": "A -\u003d B is exactly the same as A.minusAssign(B) or A \u003d A.minus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/4.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A %\u003d B is exactly the same as A.remAssign(B) or A \u003d A.rem(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/neg/13.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A +\u003d B is exactly the same as A.plusAssign(B) or A \u003d A.plus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A /\u003d B is exactly the same as A.divAssign(B) or A \u003d A.div(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/10.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A *\u003d B is exactly the same as A.timesAssign(B) or A \u003d A.times(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/7.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 0,
+          "description": "A -\u003d B is exactly the same as A.plusAssign(B) or A \u003d A.minus(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/4.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A %\u003d B is exactly the same as A.remAssign(B) or A \u003d A.rem(B) (applied in order)",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/assignments/operator-assignments/p-2/pos/13.2.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   }

compiler/tests-spec/testData/codegen/box/linked/statements/assignments/testsMap.json

@@ -1,6 +1,92 @@
 {
   "3": {
     "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": " check postfix increment expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix increment expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix increment expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression has the same type as its operand expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "check postfix decrement expression",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-increment-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-1/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 0,
+          "description": "A prefix decrement expression is an expression which uses the prefix form of operator --",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/prefix-expressions/prefix-decrement-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "2": [
         {
           "specVersion": "0.1-213",

compiler/tests-spec/testData/codegen/box/linked/statements/loop-statements/do-while-loop-statement/testsMap.json

@@ -14,6 +14,22 @@
           "description": "do-while-loop-statement evaluates the loop condition expression after evaluating the loop body.",
           "unexpectedBehaviour": false
         }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 0,
+          "description": "do-while-loop-statement evaluates the loop condition expression after evaluating the loop body.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/loop-statements/do-while-loop-statement/p-1/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 0,
+          "description": "do-while-loop-statement evaluates the loop condition expression after evaluating the loop body.",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/statements/loop-statements/do-while-loop-statement/p-1/pos/3.2.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   },

compiler/tests-spec/testData/codegen/box/linked/statements/loop-statements/while-loop-statement/testsMap.json

@@ -13,6 +13,13 @@
           "casesNumber": 0,
           "description": "while-loop-statement evaluates the loop condition expression before evaluating the loop body.",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 0,
+          "description": "A simple break expression, specified using the continue keyword, which break-jumps to the innermost loop statement in the current scope",
+          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/break-expression/p-3/pos/1.2.kt",
+          "unexpectedBehaviour": false
         }
       ]
     }

compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/testsMap.json

@@ -39,9 +39,58 @@
       ]
     }
   },
+  "2": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 4,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 4,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 1,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 1,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
   "4": {
     "neg": {
       "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 4,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-218",
           "casesNumber": 2,
@@ -52,6 +101,13 @@
     },
     "pos": {
       "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 1,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-218",
           "casesNumber": 512,
@@ -67,6 +123,33 @@
       ]
     }
   },
+  "6": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 1,
+          "description": "A character literal defines a constant holding a unicode character value",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 512,
+          "description": "to define a character the unicode code point escaped symbol \\u could be used with followed by exactly four hexadecimal digits",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 1,
+          "description": "to define a character the unicode codepoint escaped symbol \\u could be used with followed by exactly four hexadecimal digits.",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
   "5": {
     "neg": {
       "1": [
@@ -90,18 +173,5 @@
         }
       ]
     }
-  },
-  "6": {
-    "pos": {
-      "1": [
-        {
-          "specVersion": "0.1-218",
-          "casesNumber": 1,
-          "description": "to define a character the unicode codepoint escaped symbol \\u could be used with followed by exactly four hexadecimal digits.",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.1.kt",
-          "unexpectedBehaviour": false
-        }
-      ]
-    }
   }
 }

compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/testsMap.json

@@ -137,6 +137,15 @@
           "description": "try-expression has to start with a try body",
           "unexpectedBehaviour": false
         }
+      ],
+      "5": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 2,
+          "description": "try-expression has to start with a try body",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   },

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt

@@ -7,7 +7,7 @@
  *
  * SPEC VERSION: 0.1-268
  * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 2
- * RELEVANT PLACES: overload-resolution, c-level-partition -> paragraph 1 -> sentence 1 
+ * RELEVANT PLACES: overload-resolution, c-level-partition -> paragraph 1 -> sentence 1
  * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 3 -> sentence 1
  * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 3 -> sentence 2
  * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 2 -> sentence 1

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/testsMap.json

@@ -12,9 +12,87 @@
       ]
     }
   },
+  "3": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "smart cast for the property available through the operator invoke",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/type-inference/smart-casts/smart-cast-sink-stability/p-5/pos/1.1.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "extension calls with explicit and implicit receiver",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "extension calls with explicit and implicit receiver",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        }
+      ]
+    }
+  },
   "6": {
     "pos": {
       "4": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 2,
+          "description": "infix fun: Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.20.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.4.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 4,
@@ -22,6 +100,20 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.4.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 1,
@@ -40,9 +132,37 @@
           "casesNumber": 1,
           "description": "sets of declared in the package scope and star-imported extension callables",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 5,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.5.kt",
+          "unexpectedBehaviour": false
         }
       ],
       "5": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "infix fun: Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.21.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 1,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.5.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 3,
@@ -57,6 +177,27 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.6.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 1,
@@ -69,48 +210,37 @@
           "description": "sets of declared in the package scope and star-imported extension callables",
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/4.2.kt",
           "unexpectedBehaviour": false
-        }
-      ],
-      "1": [
-        {
-          "specVersion": "0.1-268",
-          "casesNumber": 10,
-          "description": "Non-extension member callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.1.kt",
-          "unexpectedBehaviour": false
-        },
-        {
-          "specVersion": "0.1-268",
-          "casesNumber": 1,
-          "description": "set of non-extension member callables only",
-          "unexpectedBehaviour": false
-        },
-        {
-          "specVersion": "0.1-268",
-          "casesNumber": 3,
-          "description": "The sets of non-extension member callables named f of type T;",
-          "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-268",
           "casesNumber": 3,
           "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.4.kt",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-268",
           "casesNumber": 5,
           "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
-          "unexpectedBehaviour": false
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.5.kt",
-        },
-        {
-          "specVersion": "0.1-268",
-          "casesNumber": 1,
-          "description": "sets of non-extension member callables only",
           "unexpectedBehaviour": false
         }
       ],
       "2": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 4,
+          "description": "Infix fun: Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.18.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.2.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 5,
@@ -118,6 +248,13 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.2.kt",
           "unexpectedBehaviour": true
         },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 2,
@@ -165,6 +302,20 @@
         }
       ],
       "3": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 2,
+          "description": "infix fun: Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.19.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.3.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 4,
@@ -172,6 +323,13 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.3.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 3,
@@ -184,6 +342,80 @@
           "casesNumber": 1,
           "description": "sets of explicitly imported, declared in the package scope and star-imported extension callables",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 5,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.5.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 6,
+          "description": "Infix fun: Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.17.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 6,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 10,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "The sets of non-extension member callables named f of type T;",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 5,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of non-extension member callables only",
+          "unexpectedBehaviour": false
         }
       ],
       "6": [
@@ -194,6 +426,177 @@
           "unexpectedBehaviour": false
         }
       ]
+    },
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 1,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.3.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "5": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 1,
+          "description": "Star-imported extension callable only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/4.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 1,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.5.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "4": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.4.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Implicitly imported extension callable without infix modifier",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "extension calls with explicit and implicit receiver",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "11": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "The sets of non-extension member callables named f of type T;",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/5.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of implicitly-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/6.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/4.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 5,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.5.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
     }
   },
   "9": {
@@ -208,25 +611,5 @@
         }
       ]
     }
-  },
-  "11": {
-    "pos": {
-      "1": [
-        {
-          "specVersion": "0.1-268",
-          "casesNumber": 1,
-          "description": "set of star-imported extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/5.1.kt",
-          "unexpectedBehaviour": false
-        },
-        {
-          "specVersion": "0.1-268",
-          "casesNumber": 1,
-          "description": "set of implicitly-imported extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/6.1.kt",
-          "unexpectedBehaviour": false
-        }
-      ]
-    }
   }
 }

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/testsMap.json

@@ -9,6 +9,13 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.10.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 5,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": true
+        },
         {
           "specVersion": "0.1-300",
           "casesNumber": 3,
@@ -114,6 +121,13 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.10.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 5,
+          "description": "Implicit receiver: sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": true
+        },
         {
           "specVersion": "0.1-280",
           "casesNumber": 3,
@@ -235,6 +249,26 @@
       ]
     }
   },
+  "4": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 5,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 5,
+          "description": "Implicit receiver: sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.1.kt",
+          "unexpectedBehaviour": true
+        }
+      ]
+    }
+  },
   "1": {
     "pos": {
       "2": [

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-specified-type-parameters/testsMap.json

@@ -1,4 +1,266 @@
 {
+  "1": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Callables star-imported into the current file;",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.10.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.14.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: set of star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.15.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: sets of declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 2,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Implicitly imported callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.11.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Callables declared in the same package",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.9.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Callables explicitly imported into the current file",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.8.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.16.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: set of implicitly-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.7.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver:  The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.12.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: sets of explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.13.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 3,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: sets of local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "call-with-trailing-lambda-expressions,Implicit receiver: set of implicitly-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.6.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables explicitly imported into the current file",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables declared in the same package",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/5.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables star-imported into the current file;",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "Top-level non-extension functions: Implicitly imported callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/7.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver:  Top-level non-extension functions: Callables star-imported into the current file;",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.10.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver: The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.14.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver: The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.15.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 2,
+          "description": "Explicit receiver:  Top-level non-extension functions: Implicitly imported callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.11.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver:  Top-level non-extension functions: Callables declared in the same package",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.9.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver:  Top-level non-extension functions: Callables explicitly imported into the current file",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.8.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver: The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.16.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver:  The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.12.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-280",
+          "casesNumber": 3,
+          "description": "Explicit receiver: The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.13.kt",
+          "unexpectedBehaviour": true
+        }
+      ]
+    },
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 1,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 1,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.3.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
   "2": {
     "pos": {
       "1": [

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/testsMap.json

@@ -127,6 +127,41 @@
           "casesNumber": 1,
           "description": "call-with-trailing-lambda-expressions,Implicit receiver: set of implicitly-imported extension callables",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/5.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/4.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.3.kt",
+          "unexpectedBehaviour": false
         }
       ]
     }

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/testsMap.json

@@ -53,6 +53,27 @@
           "casesNumber": 3,
           "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
           "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "The implicit this receiver has higher priority than phantom static implicit this",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 4,
+          "description": "The phantom static implicit this receiver has higher priority than the current class companion object receiver",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 4,
+          "description": "Superclass companion object receivers are prioritized according to the inheritance order",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/p-5/pos/5.1.kt",
+          "unexpectedBehaviour": false
         }
       ],
       "4": [
@@ -182,5 +203,179 @@
         }
       ]
     }
+  },
+  "8": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 1,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 1,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.3.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables explicitly imported into the current file",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables declared in the same package",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/5.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables star-imported into the current file;",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "Top-level non-extension functions: Implicitly imported callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/7.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        }
+      ]
+    }
+  },
+  "6": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.4.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables explicitly imported into the current file",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables declared in the same package",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/5.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "Top-level non-extension functions: Callables star-imported into the current file;",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "Top-level non-extension functions: Implicitly imported callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/7.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 3,
+          "description": "The overload candidate sets for each pair of implicit receivers: Local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.2.kt",
+          "unexpectedBehaviour": true
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/testsMap.json

@@ -73,6 +73,78 @@
           "unexpectedBehaviour": false
         }
       ],
+      "2": [
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 2,
+          "description": "infix fun: Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.20.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 1,
+          "description": "infix fun: Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.21.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 4,
+          "description": "Infix fun: Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.18.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 2,
+          "description": "infix fun: Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.19.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-300",
+          "casesNumber": 6,
+          "description": "Infix fun: Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.17.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 1,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 6,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.2.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
       "4": [
         {
           "specVersion": "0.1-313",
@@ -114,12 +186,26 @@
           "description": "Local extension infix extension callables",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-313",
           "casesNumber": 2,
           "description": "Explicitly imported infix extension callables",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-313",
           "casesNumber": 1,
@@ -155,6 +241,13 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-313",
           "casesNumber": 2,
@@ -162,6 +255,27 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Explicitly imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 1,
+          "description": "Star-imported extension callable only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/4.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.4.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-313",
           "casesNumber": 4,

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/testsMap.json

@@ -24,11 +24,64 @@
           "casesNumber": 1,
           "description": "properties available through the invoke convention are non-eligible for operator calls",
           "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 4,
+          "description": "Extension callables declared in the package scope",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.4.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "Star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 10,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "Star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.6.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 5,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.2.kt",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 4,
+          "description": "Explicitly imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.3.kt",
+          "unexpectedBehaviour": false
         }
       ]
     }
   },
   "2": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "smart case for property `plus` available through the operator invoke",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/type-inference/smart-casts/smart-cast-sink-stability/p-5/neg/1.1.kt",
+          "unexpectedBehaviour": true
+        }
+      ]
+    },
     "pos": {
       "3": [
         {

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/c-level-partition/testsMap.json

@@ -16,6 +16,13 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.2.kt",
           "unexpectedBehaviour": false
         },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.4.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 1,

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/callables-and-invoke-convention/testsMap.json

@@ -25,6 +25,13 @@
         }
       ],
       "10": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "A companion object of a classifier type named foo at its declaration site",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/callables-and-invoke-convention/p-2/pos/8.1.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-268",
           "casesNumber": 2,
@@ -40,5 +47,40 @@
         }
       ]
     }
+  },
+  "7": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "6": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 5,
+          "description": "sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.5.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
   }
 }

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/receivers/testsMap.json

@@ -1,15 +1,64 @@
 {
-  "5": {
+  "7": {
     "pos": {
       "2": [
         {
-          "specVersion": "0.1-278",
+          "specVersion": "0.1-268",
           "casesNumber": 2,
-          "description": "The implicit this receiver has higher priority than phantom static implicit this",
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.1.kt",
           "unexpectedBehaviour": false
         }
       ],
+      "3": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 2,
+          "description": "The sets of local extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.1.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "set of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 1,
+          "description": "sets of non-extension member callables only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "5": {
+    "pos": {
       "1": [
+        {
+          "specVersion": "0.1-268",
+          "casesNumber": 3,
+          "description": "sets of local, explicitly imported, declared in the package scope and star-imported extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver/p-6/pos/2.4.kt",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-278",
           "casesNumber": 2,
@@ -25,6 +74,14 @@
           "unexpectedBehaviour": false
         }
       ],
+      "2": [
+        {
+          "specVersion": "0.1-278",
+          "casesNumber": 2,
+          "description": "The implicit this receiver has higher priority than phantom static implicit this",
+          "unexpectedBehaviour": false
+        }
+      ],
       "3": [
         {
           "specVersion": "0.1-278",

compiler/tests-spec/testData/diagnostics/linked/overloadable-operators/testsMap.json

@@ -26,6 +26,13 @@
           "description": "All comparison expressions always have type kotlin.Boolean.",
           "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/p-5/pos/1.1.kt",
           "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 3,
+          "description": "The return type of these functions is not restricted.",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/p-4/pos/1.1.kt",
+          "unexpectedBehaviour": false
         }
       ]
     }

compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/testsMap.json

@@ -17,6 +17,15 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/neg/1.1.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 1,
+          "description": "An operator assignment A+\u003dB",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/neg/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     },
     "pos": {
@@ -36,6 +45,39 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/pos/1.1.kt",
           "unexpectedBehaviour": false
         }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 1,
+          "description": "An operator assignment A+\u003dB",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 1,
+          "description": "An operator assignment A+\u003dB",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/neg/1.1.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 1,
+          "description": "An operator assignment A+\u003dB",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     }
   }

compiler/tests-spec/testData/diagnostics/linked/statements/assignments/simple-assignments/testsMap.json

@@ -4,9 +4,16 @@
       "2": [
         {
           "specVersion": "0.1-222",
-          "casesNumber": 4,
+          "casesNumber": 3,
-          "description": "Both left-hand and right-hand sides of an assignment must be expressions",
+          "description": "Check the expression is not assignable if a navigation expression referring to an unmutable property",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/p-1/neg/2.1.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/p-2/neg/1.2.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-222",
+          "casesNumber": 2,
+          "description": "Check the expression is not assignable if an identifier referring to an unmutable property",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/p-2/neg/1.1.kt",
           "unexpectedBehaviour": false
         }
       ]

compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/do-while-loop-statement/testsMap.json

@@ -8,6 +8,15 @@
           "description": "do-while-loop statement body contains zero statements",
           "unexpectedBehaviour": false
         }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-253",
+          "casesNumber": 3,
+          "description": "do-while-loop statement body contains zero statements",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/do-while-loop-statement/p-1/pos/1.1.kt",
+          "unexpectedBehaviour": false
+        }
       ]
     },
     "neg": {

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java

@@ -25,7 +25,7 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
     }
 
     public void testAllFilesPresentInBox() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "helpers", "templates", "linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "helpers", "templates", "linked/exceptions", "linked/overloadable-operators", "linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
     }
 
     @TestMetadata("compiler/tests-spec/testData/codegen/box/linked")
@@ -37,7 +37,7 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
         }
 
         public void testAllFilesPresentInLinked() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked"), Pattern.compile("^(.+)\\.kt$"), null, true, "overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked"), Pattern.compile("^(.+)\\.kt$"), null, true, "exceptions", "overloadable-operators", "overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
         }
 
         @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/expressions")

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/CommonParser.kt

@@ -143,7 +143,15 @@ object CommonParser {
                 SpecTestValidationFailedReason.TESTINFO_NOT_VALID,
                 "Unknown '$testInfoOriginalElementName' test info element name."
             )
-            val testInfoElementValue = testInfoElementMatcher.group("value")
+            val testInfoElementValue: String?
+            testInfoElementValue = if (testInfoOriginalElementName == "RELEVANT PLACES") {
+                val relevantPlacesMatcher = LinkedSpecTestPatterns.relevantPlaces.matcher(rawElements)
+                if (relevantPlacesMatcher.find()) {
+                    relevantPlacesMatcher.group("places")
+                } else throw Exception("Relevant link is incorrect")
+            } else {
+                testInfoElementMatcher.group("value")
+            }
             val testInfoElementValueMatcher = testInfoElementName.valuePattern?.matcher(testInfoElementValue)
 
             if (testInfoElementValueMatcher != null && !testInfoElementValueMatcher.find())
@@ -153,7 +161,7 @@ object CommonParser {
                 )
 
             testInfoElementsMap[testInfoElementName] =
-                    SpecTestInfoElementContent(testInfoElementValue ?: "", testInfoElementValueMatcher)
+                SpecTestInfoElementContent(testInfoElementValue ?: "", testInfoElementValueMatcher)
         }
 
         rules.forEach {

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/Patterns.kt

@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.spec.utils.SpecTestLinkedType
 import org.jetbrains.kotlin.spec.utils.TestArea
 import org.jetbrains.kotlin.spec.utils.TestType
 import org.jetbrains.kotlin.spec.utils.models.SpecTestCaseInfoElementType
+import org.jetbrains.kotlin.spec.utils.parsers.CommonParser.withSpaces
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.ASTERISK_REGEX
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.INTEGER_REGEX
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.MULTILINE_COMMENT_REGEX
@@ -18,7 +19,6 @@ import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.directiveRegex
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.ps
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.sectionsInPathRegex
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.testAreaRegex
-import org.jetbrains.kotlin.spec.utils.parsers.CommonParser.withSpaces
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.testPathRegexTemplate
 import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.testTypeRegex
 import java.io.File
@@ -79,6 +79,11 @@ object LinkedSpecTestPatterns : BasePatterns {
 
     val relevantPlacesPattern: Pattern =
         Pattern.compile("""(( $ASTERISK_REGEX )?\s*((?<sections>$SECTIONS_IN_FILE_REGEX) -> )?(paragraph (?<paragraphNumber>$INTEGER_REGEX) -> )?sentence (?<sentenceNumber>$INTEGER_REGEX))+""")
+
+    private val relevantPlaceRegex =
+        Regex("""(( $ASTERISK_REGEX )?\s*($SECTIONS_IN_FILE_REGEX -> )?(paragraph $INTEGER_REGEX -> )?sentence $INTEGER_REGEX)""")
+
+    val relevantPlaces: Pattern = Pattern.compile("""RELEVANT PLACES: (?<places>(${relevantPlaceRegex}(\s)*\n)+)""")
 }
 
 object TestCasePatterns {