Mercurial > hg > graal-compiler

changeset 22789:a9e0431279e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update truffle import: Remove AdvancedInstrument code from SL language
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 08 Oct 2015 18:20:57 -0700
parents 26bbed810326
children 615f3bbbb174
files graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPETestLanguage.java mx.graal/suite.py
diffstat 2 files changed, 1 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPETestLanguage.java	Thu Oct 08 15:58:13 2015 -0700
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPETestLanguage.java	Thu Oct 08 18:20:57 2015 -0700
@@ -31,9 +31,6 @@
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrument.ASTProber;
-import com.oracle.truffle.api.instrument.AdvancedInstrumentResultListener;
-import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot;
-import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory;
 import com.oracle.truffle.api.instrument.EventHandlerNode;
 import com.oracle.truffle.api.instrument.Instrumenter;
 import com.oracle.truffle.api.instrument.KillException;
@@ -127,11 +124,6 @@
     }
 
     @Override
-    protected AdvancedInstrumentRootFactory createAdvancedInstrumentRootFactory(String expr, AdvancedInstrumentResultListener resultListener) throws IOException {
-        return null;
-    }
-
-    @Override
     protected Object createContext(Env env) {
         return null;
     }
@@ -288,23 +280,4 @@
         }
     }
 
-    static class TestAdvancedInstrumentCounterRoot extends AdvancedInstrumentRoot {
-
-        private long count;
-
-        @Override
-        public Object executeRoot(Node node, VirtualFrame vFrame) {
-            count++;
-            return null;
-        }
-
-        public long getCount() {
-            return count;
-        }
-
-        public String instrumentationInfo() {
-            return null;
-        }
-    }
-
 }
--- a/mx.graal/suite.py	Thu Oct 08 15:58:13 2015 -0700
+++ b/mx.graal/suite.py	Thu Oct 08 18:20:57 2015 -0700
@@ -14,7 +14,7 @@
             },
             {
                "name" : "truffle",
-               "version" : "c3ea80aa57628eec5686982fbb2110a48edec36e",
+               "version" : "7f32031a4812c53b3b0d5dd10d3810feecaee29a",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/truffle", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},