[GR-22467] CI: add cmake dependency.

PullRequest: js/1459

Author: woess

common.jsonnet

@@ -49,6 +49,7 @@
     packages+: {
       'apache/ab': '==2.3',
       binutils: '==2.23.2',
+      cmake: '==3.6.1',
       gcc: '==8.3.0',
       git: '>=1.8.3',
       maven: '==3.3.9',

graal-js/mx.graal-js/suite.py

@@ -24,7 +24,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "9d8d3e8667938a5d10fdac10e5f6ccfd697094d7",
+           "version" : "b2ec61658947a4276148438d403ae266345d6ce5",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
                 {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

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/JSNodeUtil.java

@@ -176,4 +176,8 @@ public static JavaScriptNode getWrappedNode(JavaScriptNode node) {
     public static boolean isTaggedNode(Node node) {
         return node instanceof JSTaggedExecutionNode || (node instanceof WrapperNode && ((WrapperNode) node).getDelegateNode() instanceof JSTaggedExecutionNode);
     }
+
+    public static boolean isInputGeneratingNode(Node node) {
+        return node instanceof JSInputGeneratingNodeWrapper || (node instanceof WrapperNode && ((WrapperNode) node).getDelegateNode() instanceof JSInputGeneratingNodeWrapper);
+    }
 }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/function/JSNewNode.java

@@ -61,6 +61,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.js.nodes.JSNodeUtil;
 import com.oracle.truffle.js.nodes.JavaScriptNode;
 import com.oracle.truffle.js.nodes.instrumentation.JSInputGeneratingNodeWrapper;
 import com.oracle.truffle.js.nodes.instrumentation.JSTags;
@@ -134,7 +135,7 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag
 
     private boolean materializationNeeded(Set<Class<? extends Tag>> materializedTags) {
         if (materializedTags.contains(ObjectAllocationTag.class)) {
-            return (!getTarget().hasSourceSection() && !(getTarget() instanceof JSInputGeneratingNodeWrapper));
+            return (!getTarget().hasSourceSection() && !JSNodeUtil.isInputGeneratingNode(getTarget()));
         }
         return false;
     }

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

@@ -44,16 +44,16 @@
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.instrumentation.InstrumentableNode;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.js.nodes.JavaScriptNode;
 import com.oracle.truffle.js.nodes.Truncatable;
 import com.oracle.truffle.js.nodes.cast.JSToInt32Node;
 import com.oracle.truffle.js.nodes.cast.JSToNumericNode;
-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 +64,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
@@ -76,25 +76,19 @@ public boolean hasTag(Class<? extends Tag> tag) {
         }
     }
 
-    @Override
-    public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag>> materializedTags) {
-        if (materializedTags.contains(UnaryOperationTag.class) && !(getOperand() instanceof JSInputGeneratingNodeWrapper)) {
-            JSComplementNode materialized = JSComplementNodeGen.create(JSInputGeneratingNodeWrapper.create(cloneUninitialized(getOperand(), materializedTags)));
-            transferSourceSectionAddExpressionTag(this, materialized);
-            return materialized;
-        }
-        return this;
-    }
-
     @Specialization
     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 +97,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;