Fix getting RContext in fast-path.

Author: Pavel Marek

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java

@@ -967,8 +967,8 @@ public Object R_ToplevelExec() {
     }
 
     @Override
-    public void restoreHandlerStacks(Object savedHandlerStack) {
-        RErrorHandling.restoreHandlerStack(savedHandlerStack);
+    public void restoreHandlerStacks(Object savedHandlerStack, RContext context) {
+        RErrorHandling.restoreHandlerStack(savedHandlerStack, context);
     }
 
     @Override

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/mixed/TruffleMixed_Call.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -31,6 +31,7 @@
 import com.oracle.truffle.r.ffi.impl.mixed.TruffleMixed_CallFactory.TruffleMixed_InvokeVoidCallNodeGen;
 import com.oracle.truffle.r.ffi.impl.mixed.TruffleMixed_DLL.MixedLLVM_Handle;
 import com.oracle.truffle.r.ffi.impl.nfi.TruffleNFI_Call;
+import com.oracle.truffle.r.runtime.context.RContext;
 import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.ffi.CallRFFI;
 import com.oracle.truffle.r.runtime.ffi.DLL;
@@ -132,16 +133,17 @@ protected void handleLLVMInvocation(VirtualFrame frame, NativeCallInfo nativeCal
         protected void handleLLVMNFIInitLib(VirtualFrame frame, NativeCallInfo nativeCallInfo, Object[] args,
                         @Cached("createLLVMInvocationNode()") InvokeVoidCallNode llvmDelegNode,
                         @Cached("createNFIInvocationNode()") InvokeVoidCallNode nfiDelegNode) {
+            RContext context = RContext.getInstance(this);
             if (nativeCallInfo.address.value instanceof RList) {
                 RList symbols = (RList) nativeCallInfo.address.value;
-                llvmDelegNode.dispatch(frame, new NativeCallInfo(nativeCallInfo.name, (SymbolHandle) symbols.getDataAt(0), nativeCallInfo.dllInfo), args);
+                llvmDelegNode.dispatch(frame, new NativeCallInfo(nativeCallInfo.name, (SymbolHandle) symbols.getDataAt(0), nativeCallInfo.dllInfo), context, args);
                 LibHandle nfiLibHandle = ((MixedLLVM_Handle) nativeCallInfo.dllInfo.handle).nfiLibHandle;
                 if (nfiLibHandle != null) {
                     DLLInfo nfiDllInfo = nativeCallInfo.dllInfo.replaceHandle(nfiLibHandle);
-                    nfiDelegNode.dispatch(frame, new NativeCallInfo(nativeCallInfo.name, (SymbolHandle) symbols.getDataAt(1), nfiDllInfo), new Object[]{nfiDllInfo});
+                    nfiDelegNode.dispatch(frame, new NativeCallInfo(nativeCallInfo.name, (SymbolHandle) symbols.getDataAt(1), nfiDllInfo), context, new Object[]{nfiDllInfo});
                 }
             } else {
-                llvmDelegNode.dispatch(frame, new NativeCallInfo(nativeCallInfo.name, nativeCallInfo.address, nativeCallInfo.dllInfo), args);
+                llvmDelegNode.dispatch(frame, new NativeCallInfo(nativeCallInfo.name, nativeCallInfo.address, nativeCallInfo.dllInfo), context, args);
             }
         }
     }

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_UpCallsRFFIImpl.java

@@ -74,6 +74,7 @@ public Object Rf_mkCharLenCE(Object bytes, int len, int encoding) {
     }
 
     @Override
+    @TruffleBoundary
     public Object R_alloc(int n, int size) {
         long result = NativeMemory.allocate(n * (long) size, "R_alloc");
         getContext().transientAllocations.peek().add(result);

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/RForceAndCallNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -48,7 +48,6 @@
 import com.oracle.truffle.r.runtime.RCaller;
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.builtins.RBuiltinDescriptor;
-import com.oracle.truffle.r.runtime.context.RContext;
 import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
 import com.oracle.truffle.r.runtime.data.RFunction;
 import com.oracle.truffle.r.runtime.data.RNull;
@@ -162,7 +161,7 @@ Object forceAndCall(Object e, RFunction fun, int n, REnvironment env,
         }
 
         RCaller rCaller = RCaller.create(env.getFrame(), RCallerHelper.createFromArguments(fun, argsAndNames));
-        return RContext.getEngine().evalFunction(fun, env.getFrame(), rCaller, false, argsAndNames.getSignature(), argsAndNames.getArguments());
+        return getRContext().getThisEngine().evalFunction(fun, env.getFrame(), rCaller, false, argsAndNames.getSignature(), argsAndNames.getArguments());
     }
 
     private static RArgsValuesAndNames createArgsAndNames(List<Object> argValues, RArgsValuesAndNames dotArgs) {

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/TryRfEvalNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -26,6 +26,7 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.RErrorHandling;
+import com.oracle.truffle.r.runtime.context.RContext;
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.ffi.util.WritePointerNode;
 
@@ -36,13 +37,14 @@ public final class TryRfEvalNode extends FFIUpCallNode.Arg4 {
 
     @Override
     public Object executeObject(Object expr, Object env, Object errorFlag, Object silent) {
-        Object handlerStack = RErrorHandling.getHandlerStack();
-        Object restartStack = RErrorHandling.getRestartStack();
+        RContext context = RContext.getInstance(this);
+        Object handlerStack = RErrorHandling.getHandlerStack(context);
+        Object restartStack = RErrorHandling.getRestartStack(context);
         boolean ok = true;
         Object result = RNull.instance;
         try {
             // TODO handle silent
-            RErrorHandling.resetStacks();
+            RErrorHandling.resetStacks(context);
             result = rfEvalNode.executeObject(expr, env);
         } catch (Throwable t) {
             ok = false;

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/FastRUpCalls.java

@@ -25,7 +25,9 @@
 import com.oracle.truffle.r.ffi.impl.nodes.FASTR_DATAPTRNode;
 import com.oracle.truffle.r.ffi.impl.nodes.FASTR_serializeNode;
 import com.oracle.truffle.r.ffi.processor.RFFICpointer;
+import com.oracle.truffle.r.ffi.processor.RFFIInject;
 import com.oracle.truffle.r.ffi.processor.RFFIUpCallNode;
+import com.oracle.truffle.r.runtime.context.RContext;
 
 /**
  * Up-calls specific to FastR used in FastR native code and not exported as part of any API.
@@ -50,7 +52,7 @@ public interface FastRUpCalls {
 
     boolean isSeekable(Object x);
 
-    void restoreHandlerStacks(Object savedHandlerStack);
+    void restoreHandlerStacks(Object savedHandlerStack, @RFFIInject RContext context);
 
     /**
      * Implements {@code DATAPTR} for types that do not have specialized API function for accessing

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/GridContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -131,6 +131,7 @@ public void setCurrentDevice(String name, GridDevice currentDevice) {
         setCurrentDevice(name, currentDevice, null);
     }
 
+    @TruffleBoundary
     public void setCurrentDevice(String name, GridDevice currentDevice, String filenamePattern) {
         assert devices.size() == RGridGraphicsAdapter.getDevicesCount() : devices.size() + " vs " + RGridGraphicsAdapter.getDevicesCount();
         RContext rCtx = RContext.getInstance();
@@ -141,6 +142,7 @@ public void setCurrentDevice(String name, GridDevice currentDevice, String filen
         assert devices.size() == RGridGraphicsAdapter.getDevicesCount() : devices.size() + " vs " + RGridGraphicsAdapter.getDevicesCount();
     }
 
+    @TruffleBoundary
     public void setCurrentDevice(int deviceIdx) {
         assert deviceIdx > 0 && deviceIdx < this.devices.size();
         RContext rCtx = RContext.getInstance();
@@ -197,6 +199,7 @@ public GridDevice getDevice(int index) {
     /**
      * Runs arbitrary function from 'fastrGrid.R' file and returns its result.
      */
+    @TruffleBoundary
     public Object evalInternalRFunction(String functionName, Object... args) {
         if (internalCode == null) {
             RContext context = RContext.getInstance();

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/WindowDevice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -22,6 +22,7 @@
  */
 package com.oracle.truffle.r.library.fastrGrid;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.r.library.fastrGrid.device.GridDevice;
 import com.oracle.truffle.r.library.fastrGrid.device.awt.JFrameDevice;
 import com.oracle.truffle.r.nodes.function.PromiseHelperNode;
@@ -41,6 +42,7 @@ private WindowDevice() {
         // only static members
     }
 
+    @TruffleBoundary
     public static GridDevice createWindowDevice(boolean byGridServer, int width, int height) {
         return createWindowDevice(RContext.getInstance(), byGridServer, width, height);
     }

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/device/SVGDevice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -32,6 +32,7 @@
 import java.text.DecimalFormat;
 import java.util.Base64;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.r.library.fastrGrid.GridColorUtils;
 import com.oracle.truffle.r.library.fastrGrid.device.DrawingContext.GridFontStyle;
@@ -214,6 +215,7 @@ private void drawPoly(DrawingContext ctx, double[] x, double[] y, int startIndex
         data.append("/>\n");
     }
 
+    @TruffleBoundary
     private void saveFile() throws DeviceCloseException {
         closeSVGDocument(data);
         try {

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/device/awt/BufferedImageDevice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -32,6 +32,7 @@
 
 import javax.imageio.ImageIO;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.r.library.fastrGrid.device.FileGridDevice;
 import com.oracle.truffle.r.library.fastrGrid.device.NotSupportedImageFormatException;
@@ -73,6 +74,7 @@ public void close() throws DeviceCloseException {
         saveImage();
     }
 
+    @TruffleBoundary
     private void saveImage() throws DeviceCloseException {
         try {
             TruffleFile file = RContext.getInstance().getSafeTruffleFile(filename);