Merge pull request #445 in G/fastr from...

Merge pull request #445 in G/fastr from ~LUKAS.STADLER_ORACLE.COM/fastr:bugfix/revert_constantnode to master

* commit 'c9f38cfc':
  fix the TruffleObject-related assertion in ConstantNode

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ConstantNode.java

@@ -24,6 +24,7 @@ package com.oracle.truffle.r.nodes.access;
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.r.nodes.function.visibility.SetVisibilityNode;
 import com.oracle.truffle.r.runtime.RRuntime;
@@ -31,7 +32,6 @@ import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
 import com.oracle.truffle.r.runtime.data.RMissing;
 import com.oracle.truffle.r.runtime.data.RPromise;
 import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.RTypedValue;
 import com.oracle.truffle.r.runtime.nodes.RNode;
 import com.oracle.truffle.r.runtime.nodes.RSourceSectionNode;
 import com.oracle.truffle.r.runtime.nodes.RSyntaxConstant;
@@ -90,7 +90,7 @@ public abstract class ConstantNode extends RSourceSectionNode implements RSyntax
             // this can be created during argument matching and "call"
             return new ConstantObjectNode(sourceSection, value);
         } else {
-            assert value instanceof RTypedValue && !(value instanceof RPromise) : value;
+            assert value instanceof TruffleObject && !(value instanceof RPromise) : value;
             return new ConstantObjectNode(sourceSection, value);
         }
     }