# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1424304429 28800
# Node ID 2f676c3ca4307d802a95a4c5f77fe946f6eb0575
# Parent  fb38e004503cabe2e3e4646505301fb17a0ab0bc
Truffle/Instrumentation:  fix some optimization bugs; instrumentation PE tests now succeed after recent compiler work

diff -r fb38e004503c -r 2f676c3ca430 graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPartialEvaluationTest.java
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPartialEvaluationTest.java	Wed Feb 18 21:55:31 2015 +0100
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPartialEvaluationTest.java	Wed Feb 18 16:07:09 2015 -0800
@@ -48,7 +48,6 @@
         assertPartialEvalEquals("constant42", root);
     }
 
-    @Ignore
     @Test
     public void constantValueProbedNoInstruments() {
         FrameDescriptor fd = new FrameDescriptor();
@@ -59,7 +58,6 @@
         assertPartialEvalEquals("constant42", root);
     }
 
-    @Ignore
     @Test
     public void constantValueProbedNullInstrument() {
         FrameDescriptor fd = new FrameDescriptor();
@@ -72,7 +70,6 @@
         assertPartialEvalEquals("constant42", root);
     }
 
-    @Ignore
     @Test
     public void constantValueProbedNullInstrumentDisposed() {
         FrameDescriptor fd = new FrameDescriptor();
@@ -86,7 +83,6 @@
         assertPartialEvalEquals("constant42", root);
     }
 
-    @Ignore
     @Test
     public void constantValueProbedTwoNullInstruments() {
         FrameDescriptor fd = new FrameDescriptor();
@@ -101,7 +97,6 @@
         assertPartialEvalEquals("constant42", root);
     }
 
-    @Ignore
     @Test
     public void constantValueProbedThreeNullInstruments() {
         FrameDescriptor fd = new FrameDescriptor();
@@ -118,7 +113,6 @@
         assertPartialEvalEquals("constant42", root);
     }
 
-    @Ignore
     @Test
     public void constantValueProbedThreeNullInstrumentsOneDisposed() {
         FrameDescriptor fd = new FrameDescriptor();
diff -r fb38e004503c -r 2f676c3ca430 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java	Wed Feb 18 21:55:31 2015 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java	Wed Feb 18 16:07:09 2015 -0800
@@ -28,6 +28,7 @@
 import java.util.*;
 
 import com.oracle.truffle.api.*;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.nodes.*;
 import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.api.utilities.*;
@@ -108,7 +109,7 @@
      * The tag trap is a global setting; it only affects {@linkplain Probe probes} with the
      * {@linkplain SyntaxTag tag} specified .
      */
-    private static SyntaxTagTrap globalTagTrap = null;
+    @CompilationFinal private static SyntaxTagTrap globalTagTrap = null;
 
     /**
      * Enables instrumentation at selected nodes in all subsequently constructed ASTs.
diff -r fb38e004503c -r 2f676c3ca430 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java	Wed Feb 18 21:55:31 2015 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java	Wed Feb 18 16:07:09 2015 -0800
@@ -181,7 +181,7 @@
          * not changed since the last time checking such an assumption failed and a reference to a
          * new assumption (associated with a new state of the {@link Probe} was retrieved.
          */
-        private Assumption probeUnchangedAssumption;
+        @CompilationFinal private Assumption probeUnchangedAssumption;
 
         private ProbeFullNode() {
             this.firstInstrument = null;