Add missing insert calls when creating child nodes

steve-s · ansalond · commit d24d4b450bd1 · 2018-06-27T17:26:31.000+02:00
(cherry picked from commit 6b1400d)
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_UserRng.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_UserRng.java
@@ -47,7 +47,7 @@ private abstract static class RNGNode extends Node {
         protected void init(NativeFunction userFunction, NativeFunction readFunction) {
             if (userFunctionNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                userFunctionNode = Message.createExecute(userFunction.getArgumentCount()).createNode();
+                userFunctionNode = insert(Message.createExecute(userFunction.getArgumentCount()).createNode());
             }
             if (userFunctionTarget == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -56,7 +56,7 @@ protected void init(NativeFunction userFunction, NativeFunction readFunction) {
             if (readFunction != null) {
                 if (readPointerNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    readPointerNode = Message.createExecute(readFunction.getArgumentCount()).createNode();
+                    readPointerNode = insert(Message.createExecute(readFunction.getArgumentCount()).createNode());
                 }
                 if (readPointerTarget == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/AttributesAccessNodes.java
@@ -183,7 +183,7 @@ public abstract static class CopyMostAttrib extends FFIUpCallNode.Arg2 {
         public Void doRAttributeStorage(RAttributeStorage x, RAttributeStorage y) {
             if (copyRegAttributes == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                copyRegAttributes = CopyOfRegAttributesNode.create();
+                copyRegAttributes = insert(CopyOfRegAttributesNode.create());
             }
             copyRegAttributes.execute(x, y);
             return null;
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/MathFunctionsNodes.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/MathFunctionsNodes.java
@@ -84,8 +84,11 @@ protected Object evaluate(double x, Object cum, Object ccum, int lowerTail, int
                 cumPtr = 0L;
                 if (cumRead == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    cumRead = Message.READ.createNode();
-                    cumWrite = Message.WRITE.createNode();
+                    cumRead = insert(Message.READ.createNode());
+                }
+                if (cumWrite == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    cumWrite = insert(Message.WRITE.createNode());
                 }
                 try {
                     cumArr[0] = ((Number) ForeignAccess.sendRead(cumRead, cumTO, 0)).doubleValue();
@@ -109,7 +112,7 @@ protected Object evaluate(double x, Object cum, Object ccum, int lowerTail, int
                 ccumPtr = 0L;
                 if (ccumWrite == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    ccumWrite = Message.WRITE.createNode();
+                    ccumWrite = insert(Message.WRITE.createNode());
                 }
             }
 
@@ -251,8 +254,11 @@ protected Object evaluate(double a, Object sgn) {
                 sgnPtr = 0L;
                 if (sgnRead == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    sgnRead = Message.READ.createNode();
-                    sgnWrite = Message.WRITE.createNode();
+                    sgnRead = insert(Message.READ.createNode());
+                }
+                if (sgnWrite == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    sgnWrite = insert(Message.WRITE.createNode());
                 }
                 try {
                     sgnArr[0] = ((Number) ForeignAccess.sendRead(sgnRead, sgnTO, 0)).intValue();
@@ -318,8 +324,11 @@ protected Object evaluate(double x, int n, int kode, @SuppressWarnings("unused")
                 ansPtr = 0L;
                 if (ansRead == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    ansRead = Message.READ.createNode();
-                    ansWrite = Message.WRITE.createNode();
+                    ansRead = insert(Message.READ.createNode());
+                }
+                if (ansWrite == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    ansWrite = insert(Message.WRITE.createNode());
                 }
                 try {
                     ansIn = ((Number) ForeignAccess.sendRead(ansRead, ansTO, 0)).doubleValue();
@@ -345,9 +354,13 @@ protected Object evaluate(double x, int n, int kode, @SuppressWarnings("unused")
                 nzPtr = 0L;
                 if (nzRead == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    nzRead = Message.READ.createNode();
-                    nzWrite = Message.WRITE.createNode();
+                    nzRead = insert(Message.READ.createNode());
                 }
+                if (nzWrite == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    nzWrite = insert(Message.WRITE.createNode());
+                }
+
                 try {
                     nzIn = ((Number) ForeignAccess.sendRead(nzRead, nzTO, 0)).intValue();
                 } catch (UnsupportedMessageException | UnknownIdentifierException e) {
@@ -372,8 +385,12 @@ protected Object evaluate(double x, int n, int kode, @SuppressWarnings("unused")
                 ierrPtr = 0L;
                 if (ierrRead == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    ierrRead = Message.READ.createNode();
-                    ierrWrite = Message.WRITE.createNode();
+                    ierrRead = insert(Message.READ.createNode());
+
+                }
+                if (ierrWrite == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    ierrWrite = insert(Message.WRITE.createNode());
                 }
                 try {
                     ierrIn = ((Number) ForeignAccess.sendRead(ierrRead, ierrTO, 0)).intValue();
@@ -702,7 +719,7 @@ protected double besselEx(BesselExCaller caller, Object b,
             } else {
                 if (bForeignArray2R == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    bForeignArray2R = ForeignArray2R.create();
+                    bForeignArray2R = insert(ForeignArray2R.create());
                 }
                 bVec = (RAbstractDoubleVector) bForeignArray2R.convert(bTO);
             }
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RandFunctionsNodes.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RandFunctionsNodes.java
@@ -239,7 +239,7 @@ protected Object evaluate(int n, Object prob, int k, Object rN) {
             } else {
                 if (probForeignArray2R == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    probForeignArray2R = ForeignArray2R.create();
+                    probForeignArray2R = insert(ForeignArray2R.create());
                 }
                 probVector = (RAbstractDoubleVector) probForeignArray2R.convert(probTO);
             }
@@ -261,9 +261,9 @@ protected Object evaluate(int n, Object prob, int k, Object rN) {
             } else {
                 if (rNForeignArray2R == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    rNForeignArray2R = ForeignArray2R.create();
+                    rNForeignArray2R = insert(ForeignArray2R.create());
                 }
-                rNVector = (RAbstractIntVector) probForeignArray2R.convert(probTO);
+                rNVector = (RAbstractIntVector) rNForeignArray2R.convert(probTO);
             }
 
             doRMultinomNode.execute(n, probVector, k, rNVector);
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignStringWrapper.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignStringWrapper.java
@@ -105,7 +105,7 @@ protected String getString(Object internalStore, int index) {
                 if (isNullProfile.profile(value instanceof TruffleObject)) {
                     if (isNull == null) {
                         CompilerDirectives.transferToInterpreterAndInvalidate();
-                        isNull = Message.IS_NULL.createNode();
+                        isNull = insert(Message.IS_NULL.createNode());
                     }
                     if (ForeignAccess.sendIsNull(isNull, (TruffleObject) value)) {
                         return RRuntime.STRING_NA;

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public abstract static class CopyMostAttrib extends FFIUpCallNode.Arg2 {`
`183`	`183`	`public Void doRAttributeStorage(RAttributeStorage x, RAttributeStorage y) {`
`184`	`184`	`if (copyRegAttributes == null) {`
`185`	`185`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`186`		`- copyRegAttributes = CopyOfRegAttributesNode.create();`
	`186`	`+ copyRegAttributes = insert(CopyOfRegAttributesNode.create());`
`187`	`187`	`}`
`188`	`188`	`copyRegAttributes.execute(x, y);`
`189`	`189`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ protected Object evaluate(int n, Object prob, int k, Object rN) {`
`239`	`239`	`} else {`
`240`	`240`	`if (probForeignArray2R == null) {`
`241`	`241`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`242`		`- probForeignArray2R = ForeignArray2R.create();`
	`242`	`+ probForeignArray2R = insert(ForeignArray2R.create());`
`243`	`243`	`}`
`244`	`244`	`probVector = (RAbstractDoubleVector) probForeignArray2R.convert(probTO);`
`245`	`245`	`}`
`@@ -261,9 +261,9 @@ protected Object evaluate(int n, Object prob, int k, Object rN) {`
`261`	`261`	`} else {`
`262`	`262`	`if (rNForeignArray2R == null) {`
`263`	`263`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`264`		`- rNForeignArray2R = ForeignArray2R.create();`
	`264`	`+ rNForeignArray2R = insert(ForeignArray2R.create());`
`265`	`265`	`}`
`266`		`- rNVector = (RAbstractIntVector) probForeignArray2R.convert(probTO);`
	`266`	`+ rNVector = (RAbstractIntVector) rNForeignArray2R.convert(probTO);`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`doRMultinomNode.execute(n, probVector, k, rNVector);`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected String getString(Object internalStore, int index) {`
`105`	`105`	`if (isNullProfile.profile(value instanceof TruffleObject)) {`
`106`	`106`	`if (isNull == null) {`
`107`	`107`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`108`		`- isNull = Message.IS_NULL.createNode();`
	`108`	`+ isNull = insert(Message.IS_NULL.createNode());`
`109`	`109`	`}`
`110`	`110`	`if (ForeignAccess.sendIsNull(isNull, (TruffleObject) value)) {`
`111`	`111`	`return RRuntime.STRING_NA;`