Preserve ~ operator input value for instrumentation.

Author: woess

graal-js/src/com.oracle.truffle.js.test.instrumentation/src/com/oracle/truffle/js/test/instrumentation/UnaryOperationTest.java

@@ -93,9 +93,8 @@ public void voidMethod() {
     }
 
     @Test
-    public void toInt() {
-        // 'true' is converted to '1' before the binary operation.
-        assertBasicUnaryOperation("var x = true; var b = ~x;", true, 1, -2, "~");
+    public void bitwiseNot() {
+        assertBasicUnaryOperation("var x = true; var b = ~x;", true, true, -2, "~");
     }
 
     @Test

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/unary/JSComplementNode.java

@@ -44,6 +44,7 @@
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableNode;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.NodeInfo;
@@ -54,6 +55,7 @@
 import com.oracle.truffle.js.nodes.instrumentation.JSInputGeneratingNodeWrapper;
 import com.oracle.truffle.js.nodes.instrumentation.JSTags.UnaryOperationTag;
 import com.oracle.truffle.js.runtime.BigInt;
+import com.oracle.truffle.js.runtime.SafeInteger;
 
 @NodeInfo(shortName = "~")
 public abstract class JSComplementNode extends JSUnaryNode {
@@ -64,7 +66,7 @@ protected JSComplementNode(JavaScriptNode operand) {
 
     public static JSComplementNode create(JavaScriptNode operand) {
         Truncatable.truncate(operand);
-        return JSComplementNodeGen.create(JSToNumericNode.create(operand));
+        return JSComplementNodeGen.create(operand);
     }
 
     @Override
@@ -91,10 +93,14 @@ protected int doInteger(int a) {
         return ~a;
     }
 
+    @Specialization
+    protected int doSafeInteger(SafeInteger a) {
+        return ~a.intValue();
+    }
+
     @Specialization
     protected int doDouble(double a,
                     @Cached("create()") JSToInt32Node toInt32Node) {
-
         return doInteger(toInt32Node.executeInt(a));
     }
 
@@ -103,6 +109,18 @@ protected BigInt doBigInt(BigInt a) {
         return a.not();
     }
 
+    @Specialization(replaces = {"doInteger", "doSafeInteger", "doDouble", "doBigInt"})
+    protected Object doGeneric(VirtualFrame frame, Object value,
+                    @Cached JSToNumericNode toNumericNode,
+                    @Cached("createInner()") JSComplementNode recursive) {
+        Object number = toNumericNode.execute(value);
+        return recursive.execute(frame, number);
+    }
+
+    static JSComplementNode createInner() {
+        return JSComplementNodeGen.create(null);
+    }
+
     @Override
     public boolean isResultAlwaysOfType(Class<?> clazz) {
         return clazz == Number.class;