Merge remote branch 'origin/master'

compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java

@@ -254,19 +254,24 @@ public class ClosureCodegen extends ObjectOrClosureCodegen {
             iv.invokespecial(funClass, "<init>", "(Ljet/typeinfo/TypeInfo;)V");
 
             i = 1;
+            int k = 0;
             for (Type type : argTypes) {
                 StackValue.local(0, JetTypeMapper.TYPE_OBJECT).put(JetTypeMapper.TYPE_OBJECT, iv);
                 StackValue.local(i, type).put(type, iv);
                 final String fieldName;
                 if (captureThis && i == 1) {
                     fieldName = "this$0";
+                    i++;
+                    k++;
                 }
                 else {
                     if (captureReceiver != null && (captureThis && i == 2 || !captureThis && i == 1)) {
                         fieldName = "receiver$0";
+                        i++;
+                        k++;
                     }
                     else {
-                        fieldName = "$" + (i);
+                        fieldName = "$" + (i-k);
                         i++;
                     }
                 }

compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java

@@ -200,6 +200,8 @@ public class JetTypeMapper {
             }
             return name;
         }
+        if(name.contains("/"))
+            return name;
         if (container != null) {
             if (container instanceof ModuleDescriptor) {
                 return name;

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetJavaMirrorMarker.java

@@ -0,0 +1,9 @@
+/*
+ * @author max
+ */
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.intellij.psi.PsiClass;
+
+public interface JetJavaMirrorMarker extends PsiClass {
+}