[GR-2313] Thread safety issues in FrameSlotInfo, avoid problem with ExactMath.multiplyExact.

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/env/frame/FrameSlotChangeMonitor.java

@@ -517,38 +517,43 @@ public final class FrameSlotChangeMonitor {
          */
 
         private void setValue(boolean value, FrameSlot slot) {
-            if (stableValue != null && (!(stableValue.getValue() instanceof Boolean) || ((boolean) stableValue.getValue()) != value)) {
-                invalidateStableValue(value, slot);
+            StableValue<Object> sv = stableValue;
+            if (sv != null && (!(sv.getValue() instanceof Boolean) || ((boolean) sv.getValue()) != value)) {
+                invalidateStableValue(sv, value, slot);
             }
         }
 
         private void setValue(byte value, FrameSlot slot) {
-            if (stableValue != null && (!(stableValue.getValue() instanceof Byte) || ((byte) stableValue.getValue()) != value)) {
-                invalidateStableValue(value, slot);
+            StableValue<Object> sv = stableValue;
+            if (sv != null && (!(sv.getValue() instanceof Byte) || ((byte) sv.getValue()) != value)) {
+                invalidateStableValue(sv, value, slot);
             }
         }
 
         private void setValue(int value, FrameSlot slot) {
-            if (stableValue != null && (!(stableValue.getValue() instanceof Integer) || ((int) stableValue.getValue()) != value)) {
-                invalidateStableValue(value, slot);
+            StableValue<Object> sv = stableValue;
+            if (sv != null && (!(sv.getValue() instanceof Integer) || ((int) sv.getValue()) != value)) {
+                invalidateStableValue(sv, value, slot);
             }
         }
 
         private void setValue(double value, FrameSlot slot) {
-            if (stableValue != null && (!(stableValue.getValue() instanceof Double) || ((double) stableValue.getValue()) != value)) {
-                invalidateStableValue(value, slot);
+            StableValue<Object> sv = stableValue;
+            if (sv != null && (!(sv.getValue() instanceof Double) || ((double) sv.getValue()) != value)) {
+                invalidateStableValue(sv, value, slot);
             }
         }
 
         private void setValue(Object value, FrameSlot slot) {
-            if (stableValue != null && stableValue.getValue() != value) {
-                invalidateStableValue(value, slot);
+            StableValue<Object> sv = stableValue;
+            if (sv != null && sv.getValue() != value) {
+                invalidateStableValue(sv, value, slot);
             }
         }
 
-        private void invalidateStableValue(Object value, FrameSlot slot) {
+        private void invalidateStableValue(StableValue<Object> sv, Object value, FrameSlot slot) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            stableValue.getAssumption().invalidate();
+            sv.getAssumption().invalidate();
             if (invalidationCount > 0) {
                 invalidationCount--;
                 out("setting singleton value %s = %s", slot.getIdentifier(), value == null ? "null" : value.getClass());

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryArithmetic.java

@@ -136,13 +136,14 @@ public abstract class BinaryArithmetic extends Operation {
 
         @Override
         public int op(int left, int right) {
-            try {
-                return ExactMath.addExact(left, right);
-            } catch (ArithmeticException e) {
+            int r = left + right;
+            // TODO: not using ExactMath because of perf problems
+            if (((left ^ r) & (right ^ r)) < 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 replace(new AddOverflow());
                 return INT_NA;
             }
+            return r;
         }
 
         @Override
@@ -193,13 +194,14 @@ public abstract class BinaryArithmetic extends Operation {
 
         @Override
         public int op(int left, int right) {
-            try {
-                return ExactMath.subtractExact(left, right);
-            } catch (ArithmeticException e) {
+            int r = left - right;
+            // TODO: not using ExactMath because of perf problems
+            if (((left ^ right) & (left ^ r)) < 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 replace(new SubtractOverflow());
                 return INT_NA;
             }
+            return r;
         }
 
         @Override
@@ -249,13 +251,14 @@ public abstract class BinaryArithmetic extends Operation {
 
         @Override
         public int op(int left, int right) {
-            try {
-                return ExactMath.multiplyExact(left, right);
-            } catch (ArithmeticException e) {
+            long r = (long) left * (long) right;
+            // TODO: not using ExactMath because of perf problems
+            if ((int) r != r) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 replace(new MultiplyOverflow());
                 return INT_NA;
             }
+            return (int) r;
         }
 
         @Override