Change asm library path

compiler/tests/compiler-tests.iml

@@ -29,15 +29,6 @@
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/asm4-all.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -65,5 +56,14 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../ideaSDK/core/asm-all.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt

@@ -17,10 +17,10 @@
 package org.jetbrains.kotlin.codegen
 
 import junit.framework.TestCase
-import org.jetbrains.asm4.ClassReader
+import org.jetbrains.org.objectweb.asm.ClassReader
-import org.jetbrains.asm4.ClassVisitor
+import org.jetbrains.org.objectweb.asm.ClassVisitor
-import org.jetbrains.asm4.MethodVisitor
+import org.jetbrains.org.objectweb.asm.MethodVisitor
-import org.jetbrains.asm4.Opcodes
+import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.kotlin.test.ConfigurationKind
 import java.util.*