From 4b22685dc53468bb1f3039cebee9d62f6dbda902 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 5 Apr 2016 16:40:30 +0300
Subject: [PATCH] Change asm library path

---
 compiler/tests/compiler-tests.iml              | 18 +++++++++---------
 .../kotlin/codegen/MethodOrderTest.kt          |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 2dec0cdf467..005d4f94777 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/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>
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt
index 68fd7a955d9..0d5e5a401ba 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt
+++ b/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.asm4.ClassVisitor
-import org.jetbrains.asm4.MethodVisitor
-import org.jetbrains.asm4.Opcodes
+import org.jetbrains.org.objectweb.asm.ClassReader
+import org.jetbrains.org.objectweb.asm.ClassVisitor
+import org.jetbrains.org.objectweb.asm.MethodVisitor
+import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.kotlin.test.ConfigurationKind
 import java.util.*