RFR: remove ASM dependency

Christian Thalinger christian.thalinger at oracle.com
Tue Dec 30 03:24:08 UTC 2014


> On Dec 29, 2014, at 3:58 PM, Christian Thalinger <christian.thalinger at oracle.com> wrote:
> 
> This patch replaces the only use of org.objectweb.asm with jdk.internal.org.objectweb.asm and removes the ASM dependency.
> 

Seems patches are not enabled on this list.  Here is the patch inlined:

diff -r 7ff41ad072ef graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java	Tue Dec 30 02:21:15 2014 +0100
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java	Mon Dec 29 19:23:25 2014 -0800
@@ -23,7 +23,7 @@
 package com.oracle.graal.jtt.except;
 
 import org.junit.*;
-import org.objectweb.asm.*;
+import jdk.internal.org.objectweb.asm.*;
 
 import com.oracle.graal.jtt.*;
 
@@ -45,20 +45,20 @@ public class UntrustedInterfaces extends
      *     public void setField() {
      *         field = new TestConstant();
      *     }
-     * 
+     *
      *     public void setStaticField() {
      *         staticField = new TestConstant();
      *     }
-     * 
+     *
      *     public int callMe(CallBack callback) {
      *         return callback.callBack(new TestConstant());
      *     }
-     * 
+     *
      *     public TestInterface get() {
      *         return new TestConstant();
      *     }
      * }
-     * 
+     *
      * private static final class TestConstant implements TestInterface {
      *     public int method() {
      *         return 42;
diff -r 7ff41ad072ef mx/suite.py
--- a/mx/suite.py	Tue Dec 30 02:21:15 2014 +0100
+++ b/mx/suite.py	Mon Dec 29 19:23:25 2014 -0800
@@ -139,21 +139,6 @@ suite = {
       ],
     },
 
-    "ASM" : {
-      "path" : "lib/asm-5.0.3.jar",
-      "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3.jar",
-        "https://search.maven.org/remotecontent?filepath=org/ow2/asm/asm/5.0.3/asm-5.0.3.jar",
-      ],
-      "sha1" : "dcc2193db20e19e1feca8b1240dbbc4e190824fa",
-      "sourcePath" : "lib/asm-5.0.3-sources.jar",
-      "sourceSha1" : "f0f24f6666c1a15c7e202e91610476bd4ce59368",
-      "sourceUrls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3-sources.jar",
-        "https://search.maven.org/remotecontent?filepath=org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar",
-      ],
-    },
-
     "JAVA_ALLOCATION_INSTRUMENTER" : {
       "path" : "lib/java-allocation-instrumenter.jar",
       "sourcePath" : "lib/java-allocation-instrumenter.jar",
@@ -947,7 +932,6 @@ suite = {
       "sourceDirs" : ["src"],
       "dependencies" : [
         "com.oracle.graal.compiler.test",
-        "ASM",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",



More information about the graal-dev mailing list