Import directives migrated from ASM 3.3 to 4.0 with renamed packages

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

@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.calls.*;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
-import org.objectweb.asm.*;
+import org.jetbrains.asm4.*;
 
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;

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

@@ -23,9 +23,9 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.types.JetType;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

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

@@ -16,23 +16,22 @@
 
 package org.jetbrains.jet.codegen;
 
-import com.intellij.openapi.progress.ProcessCanceledException;
+import org.jetbrains.asm4.MethodVisitor;
+import org.jetbrains.asm4.Opcodes;
+import org.jetbrains.asm4.Type;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
+import static org.jetbrains.asm4.Opcodes.ACC_ABSTRACT;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.jetbrains.asm4.Opcodes.ACC_PUBLIC;
 
 /**
  * @author max

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

@@ -21,11 +21,11 @@ package org.jetbrains.jet.codegen;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.AnnotationVisitor;
+import org.jetbrains.asm4.AnnotationVisitor;
-import org.objectweb.asm.ClassVisitor;
+import org.jetbrains.asm4.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
+import org.jetbrains.asm4.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
 
 public abstract class ClassBuilder {
     public static class Concrete extends ClassBuilder {

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

@@ -17,8 +17,8 @@
 package org.jetbrains.jet.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.objectweb.asm.ClassWriter;
+import org.jetbrains.asm4.ClassWriter;
-import org.objectweb.asm.util.TraceClassVisitor;
+import org.jetbrains.asm4.util.TraceClassVisitor;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

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

@@ -37,17 +37,17 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
-import org.objectweb.asm.Label;
+import org.jetbrains.asm4.Label;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
-import org.objectweb.asm.signature.SignatureWriter;
+import org.jetbrains.asm4.signature.SignatureWriter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.objectweb.asm.Opcodes.*;
+import static org.jetbrains.asm4.Opcodes.*;
 
 public class ClosureCodegen extends ObjectOrClosureCodegen {
 

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

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 /**
  * @author yole

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

@@ -24,8 +24,8 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.Collections;
 import java.util.HashMap;

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

@@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.TypeSubstitutor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

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

@@ -19,7 +19,7 @@ package org.jetbrains.jet.codegen;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 import java.util.Collections;
 import java.util.List;

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

@@ -40,12 +40,12 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibraryNames;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.objectweb.asm.Label;
+import org.jetbrains.asm4.Label;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.*;
 

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

@@ -32,15 +32,15 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
-import org.objectweb.asm.Label;
+import org.jetbrains.asm4.Label;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.*;
 
-import static org.objectweb.asm.Opcodes.*;
+import static org.jetbrains.asm4.Opcodes.*;
 
 /**
  * @author max

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

@@ -20,8 +20,8 @@
 package org.jetbrains.jet.codegen;
 
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.utils.Progress;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.Collection;
 import java.util.Collections;

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

@@ -37,16 +37,16 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.utils.BitSetUtils;
-import org.objectweb.asm.AnnotationVisitor;
+import org.jetbrains.asm4.AnnotationVisitor;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.*;
 
 import static org.jetbrains.jet.codegen.JetTypeMapper.TYPE_OBJECT;
-import static org.objectweb.asm.Opcodes.*;
+import static org.jetbrains.asm4.Opcodes.*;
 
 /**
  * @author max

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

@@ -42,14 +42,14 @@ import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibraryNames;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
 import org.jetbrains.jet.lang.types.ref.ClassName;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.util.*;
 
-import static org.objectweb.asm.Opcodes.*;
+import static org.jetbrains.asm4.Opcodes.*;
 
 /**
  * @author yole

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

@@ -32,14 +32,14 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.utils.Progress;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import static org.objectweb.asm.Opcodes.*;
+import static org.jetbrains.asm4.Opcodes.*;
 
 /**
  * @author max

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

@@ -22,8 +22,8 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

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

@@ -31,11 +31,11 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
-import org.objectweb.asm.FieldVisitor;
+import org.jetbrains.asm4.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.BitSet;
 

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

@@ -29,10 +29,10 @@ import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.JdkNames;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import javax.inject.Inject;
 import java.util.List;

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

@@ -27,11 +27,11 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.objectweb.asm.Label;
+import org.jetbrains.asm4.Label;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.List;
 

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

@@ -16,9 +16,9 @@
 
 package org.jetbrains.jet.codegen;
 
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 /**
  * @author Stepan Koltsov

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

@@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayGet.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIndices.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java

@@ -18,6 +18,8 @@ package org.jetbrains.jet.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.asm4.Type;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.jet.codegen.ExpressionCodegen;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
@@ -29,11 +31,8 @@ import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType;
-import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibraryNames;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySet.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySize.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.java

@@ -23,9 +23,9 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.ExpressionCodegen;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.java

@@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java

@@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.java

@@ -25,8 +25,8 @@ import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetParenthesizedExpression;
 import org.jetbrains.jet.lang.psi.JetReferenceExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethod.java

@@ -24,8 +24,8 @@ import org.jetbrains.jet.codegen.ExpressionCodegen;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java

@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
 import org.jetbrains.jet.lang.types.TypeProjection;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Inv.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorIterator.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.ExpressionCodegen;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassArray.java

@@ -30,8 +30,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.ResolvedValueArgument;
 import org.jetbrains.jet.lang.resolve.calls.VarargValueArgument;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 import java.util.Map;

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java

@@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java

@@ -24,8 +24,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NewArray.java

@@ -24,8 +24,8 @@ import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java

@@ -22,8 +22,8 @@ import org.jetbrains.jet.codegen.ExpressionCodegen;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NumberCast.java

@@ -22,8 +22,8 @@ import org.jetbrains.jet.codegen.ExpressionCodegen;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/PsiMethodCall.java

@@ -22,8 +22,8 @@ import org.jetbrains.jet.codegen.*;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringGetChar.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringLength.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StupidSync.java

@@ -25,8 +25,8 @@ import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.Arrays;
 import java.util.List;

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Sure.java

@@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
-import org.objectweb.asm.Label;
+import org.jetbrains.asm4.Label;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ToString.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryMinus.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryPlus.java

@@ -24,8 +24,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UpTo.java

@@ -23,8 +23,8 @@ import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetBinaryExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.InstructionAdapter;
+import org.jetbrains.asm4.commons.InstructionAdapter;
 
 import java.util.List;
 

compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java

@@ -29,11 +29,11 @@ import org.jetbrains.jet.rt.signature.JetSignatureAdapter;
 import org.jetbrains.jet.rt.signature.JetSignatureReader;
 import org.jetbrains.jet.rt.signature.JetSignatureVariance;
 import org.jetbrains.jet.rt.signature.JetSignatureWriter;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
-import org.objectweb.asm.signature.SignatureVisitor;
+import org.jetbrains.asm4.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
+import org.jetbrains.asm4.signature.SignatureWriter;
-import org.objectweb.asm.util.CheckSignatureAdapter;
+import org.jetbrains.asm4.util.CheckSignatureAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmMethodParameterSignature.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.codegen.signature;
 
 import org.jetbrains.annotations.NotNull;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 /**
  * @author Stepan Koltsov

compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmMethodSignature.java

@@ -18,8 +18,8 @@ package org.jetbrains.jet.codegen.signature;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
-import org.objectweb.asm.commons.Method;
+import org.jetbrains.asm4.commons.Method;
 
 import java.util.ArrayList;
 import java.util.List;

compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java

@@ -19,8 +19,8 @@ package org.jetbrains.jet.codegen.signature.kotlin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.utils.BitSetUtils;
-import org.objectweb.asm.AnnotationVisitor;
+import org.jetbrains.asm4.AnnotationVisitor;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
 
 import java.util.BitSet;
 

compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetValueParameterAnnotationWriter.java

@@ -18,8 +18,8 @@ package org.jetbrains.jet.codegen.signature.kotlin;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
-import org.objectweb.asm.AnnotationVisitor;
+import org.jetbrains.asm4.AnnotationVisitor;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
 
 /**
  * @author Stepan Koltsov

compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplClassLoader.java

@@ -19,8 +19,8 @@ package org.jetbrains.jet.cli.jvm.repl;
 import com.google.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
-import org.objectweb.asm.ClassReader;
+import org.jetbrains.asm4.ClassReader;
-import org.objectweb.asm.util.TraceClassVisitor;
+import org.jetbrains.asm4.util.TraceClassVisitor;
 
 import java.io.PrintWriter;
 import java.util.Map;

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

@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 /**
  * @author Stepan Koltsov

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

@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java;
 
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 import java.util.HashMap;
 import java.util.Map;

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java

@@ -28,10 +28,10 @@ import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.ClassBuilder;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
-import org.objectweb.asm.ClassReader;
+import org.jetbrains.asm4.ClassReader;
-import org.objectweb.asm.ClassVisitor;
+import org.jetbrains.asm4.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
+import org.jetbrains.asm4.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
+import org.jetbrains.asm4.MethodVisitor;
 
 import java.util.List;
 

compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java

@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.parsing.JetParsingTest;
-import org.objectweb.asm.Type;
+import org.jetbrains.asm4.Type;
 
 import java.io.File;
 import java.io.IOException;
@@ -163,7 +163,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
         }
     }
 
-    private Constructor getConstructor(@NotNull Class<?> clazz, org.objectweb.asm.commons.Method method) {
+    private Constructor getConstructor(@NotNull Class<?> clazz, org.jetbrains.asm4.commons.Method method) {
         if (!method.getName().equals("<init>")) {
             throw new IllegalArgumentException("not constructor: " + method);
         }

compiler/tests/org/jetbrains/jet/codegen/WriteAccessFlagsTest.java

@@ -31,8 +31,8 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.JetLanguage;
-import org.objectweb.asm.ClassReader;
+import org.jetbrains.asm4.ClassReader;
-import org.objectweb.asm.Opcodes;
+import org.jetbrains.asm4.Opcodes;
 
 import java.io.File;
 import java.io.IOException;