[GR-27617] Fix issues with -H:+RemoveSaturatedTypeFlows.

PullRequest: fastr/2538

Author: steve-s

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java

@@ -650,6 +650,7 @@ public SourceSection getSourceSection() {
         }
 
         @Override
+        @TruffleBoundary
         public boolean isInternal() {
             return RSyntaxNode.isInternal(getBody().getLazySourceSection());
         }

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Quote.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 import static com.oracle.truffle.r.runtime.builtins.RBehavior.PURE;
 import static com.oracle.truffle.r.runtime.builtins.RBuiltinKind.PRIMITIVE;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -67,6 +68,7 @@ protected final Object cachedCreateLanguage(Closure closure) {
         return result;
     }
 
+    @TruffleBoundary
     protected static Object createLanguage(Closure closure) {
         return RASTUtils.createLanguageElement(closure.getExpr().asRSyntaxNode());
     }

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Substitute.java

@@ -28,9 +28,11 @@
 import static com.oracle.truffle.r.runtime.builtins.RBuiltinKind.PRIMITIVE;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 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.profiles.BranchProfile;
 import com.oracle.truffle.r.library.methods.SubstituteDirect;
 import com.oracle.truffle.r.nodes.RASTUtils;
 import com.oracle.truffle.r.nodes.builtin.EnvironmentNodes.RList2EnvNode;
@@ -51,6 +53,7 @@
 public abstract class Substitute extends RBuiltinNode.Arg2 {
 
     @Child private Quote quote;
+    private final BranchProfile createLanguageBranch = BranchProfile.create();
 
     static {
         Casts casts = new Casts(Substitute.class);
@@ -114,6 +117,12 @@ private Object doSubstituteWithEnv(RPromise expr, REnvironment env) {
 
         // The "expr" promise comes from the no-evalarg aspect of the builtin,
         // so get the actual expression (AST) from that
+        createLanguageBranch.enter();
+        return createLanguage(expr, env);
+    }
+
+    @TruffleBoundary(allowInlining = true)
+    private Object createLanguage(RPromise expr, REnvironment env) {
         return RASTUtils.createLanguageElement(RSubstitute.substitute(env, expr.getClosure().getSyntaxElement(), getRLanguage()));
     }
 

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java

@@ -30,9 +30,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.r.nodes.function.RCallNode;
-import com.oracle.truffle.r.runtime.nodes.unary.CastNode;
-import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RArguments.S3Args;
+import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RError.ErrorContext;
 import com.oracle.truffle.r.runtime.builtins.RBuiltin;
 import com.oracle.truffle.r.runtime.builtins.RBuiltinDescriptor;
@@ -47,6 +46,7 @@
 import com.oracle.truffle.r.runtime.nodes.RSyntaxElement;
 import com.oracle.truffle.r.runtime.nodes.RSyntaxLookup;
 import com.oracle.truffle.r.runtime.nodes.builtin.RBuiltinBaseNode;
+import com.oracle.truffle.r.runtime.nodes.unary.CastNode;
 
 @TypeSystemReference(RTypes.class)
 public abstract class RBuiltinNode extends RBuiltinBaseNode implements NodeWithArgumentCasts {
@@ -87,7 +87,10 @@ private static RBuiltin getRBuiltin(Class<?> klass) {
      * information as initially parsed. However, currently, builtins called via
      * {@code do.call("func", )} have a {@link RBuiltinRootNode} as a parent, which carries no
      * context about the original call, so we return {@code null}.
+     *
+     * Note: behind Truffle boundary, because it messes up with saturated type flows.
      */
+    @TruffleBoundary(allowInlining = true)
     public RSyntaxElement getOriginalCall() {
         Node p = getParent();
         while (p != null) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nodes/RBaseNode.java

@@ -24,6 +24,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.LoopNode;
@@ -143,6 +144,7 @@ protected RSyntaxNode getRSyntaxNode() {
      * However, currently that is not always the case, so this method can be used by defensive code.
      * It returns {@code null} if the {@link RSyntaxNode} cannot be located.
      */
+    @TruffleBoundary
     private RSyntaxNode checkGetRSyntaxNode() {
         Node current = this;
         while (current != null) {