Mercurial > hg > truffle

changeset 22271:a13fef77ebd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix instrumentation changes did break basic truffle use-cases.
author Christian Humer <christian.humer@oracle.com>
date Thu, 01 Oct 2015 13:38:28 +0200
parents 1e4021a273b1
children 5309cc9668e3
files truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrumenter.java
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java	Wed Sep 30 21:41:12 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java	Thu Oct 01 13:38:28 2015 +0200
@@ -262,7 +262,7 @@
         if (known == null) {
             vm = CURRENT_VM.get();
             if (vm == null) {
-                throw new IllegalStateException("Accessor.getInstrumenter access to vm");
+                return null;
             }
         } else {
             vm = known;
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrumenter.java	Wed Sep 30 21:41:12 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrumenter.java	Thu Oct 01 13:38:28 2015 +0200
@@ -649,7 +649,10 @@
         @Override
         protected void probeAST(RootNode rootNode) {
             // Normally null vm argument; can be reflectively set for testing
-            super.getInstrumenter(testVM).probeAST(rootNode);
+            Instrumenter instrumenter = super.getInstrumenter(testVM);
+            if (instrumenter != null) {
+                instrumenter.probeAST(rootNode);
+            }
         }
     }