Use new context API in FFIProcessor

Author: Pavel Marek

com.oracle.truffle.r.ffi.processor/src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java

@@ -47,7 +47,6 @@
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
 import javax.tools.Diagnostic.Kind;
-
 import javax.tools.JavaFileObject;
 
 public final class FFIProcessor extends AbstractProcessor {
@@ -319,6 +318,7 @@ private void generateCallClass(ExecutableElement m) throws IOException {
         w.append("import com.oracle.truffle.api.library.ExportMessage;\n");
         w.append("import com.oracle.truffle.api.nodes.ControlFlowException;\n");
         w.append("import com.oracle.truffle.api.dsl.Cached;\n");
+        w.append("import com.oracle.truffle.api.library.CachedLibrary;\n");
         w.append("import com.oracle.truffle.api.profiles.ValueProfile;\n");
         w.append("import com.oracle.truffle.r.ffi.impl.upcalls.UpCallsRFFI.HandleUpCallExceptionNode;\n");
         w.append("import com.oracle.truffle.r.runtime.RError;\n");
@@ -353,10 +353,6 @@ private void generateCallClass(ExecutableElement m) throws IOException {
             w.append("import com.oracle.truffle.r.runtime.ffi.FFIMaterializeNode;\n");
             w.append("import com.oracle.truffle.r.runtime.ffi.FFIToNativeMirrorNode;\n");
         }
-        w.append("import com.oracle.truffle.api.TruffleLanguage.ContextReference;\n");
-        w.append("import com.oracle.truffle.api.dsl.CachedContext;\n");
-        w.append("import com.oracle.truffle.r.runtime.context.TruffleRLanguage;\n");
-
         w.append("\n");
 
         w.append("// Checkstyle: stop method name check\n");
@@ -381,11 +377,11 @@ private void generateCallClass(ExecutableElement m) throws IOException {
         if (unwrapNodes.length() > 0) {
             w.append(unwrapNodes);
         }
+        w.append("                @CachedLibrary(\"this\") InteropLibrary interopLib,\n");
 
-        w.append("                @CachedContext(TruffleRLanguage.class) ContextReference<RContext> ctxRef,\n");
         if (needsCallTarget) {
             w.append("                @Cached() com.oracle.truffle.r.ffi.impl.upcalls.UpCallBase.CallNode callNode,\n");
-            w.append("                @Cached(value = \"createCallTarget(ctxRef)\", allowUncached = true) CallTarget callTarget,\n");
+            w.append("                @Cached(value = \"createCallTarget(interopLib)\", allowUncached = true) CallTarget callTarget,\n");
         } else if (needsNode) {
             if (nodeClass.getModifiers().contains(Modifier.ABSTRACT)) {
                 w.append("                @Cached() " + nodeClassName + " node,\n");
@@ -412,7 +408,7 @@ private void generateCallClass(ExecutableElement m) throws IOException {
         w.append("        if (RFFILog.logEnabled()) {\n");
         w.append("            RFFILog.logUpCall(\"" + name + "\", arguments);\n");
         w.append("        }\n");
-        w.append("        RContext ctx = ctxRef.get();\n");
+        w.append("        RContext ctx = RContext.getInstance(interopLib);\n");
         w.append("        RFFIContext rffiCtx = ctxProfile.profile(ctx.getStateRFFI());\n");
 
         if (returnKind != TypeKind.VOID) {
@@ -498,8 +494,9 @@ private void generateCallClass(ExecutableElement m) throws IOException {
         w.append("\n");
 
         if (needsCallTarget) {
-            w.append("    protected static CallTarget createCallTarget(ContextReference<RContext> ctxRef) {\n");
-            w.append("        RFFIUpCallTargets targets = ctxRef.get().getRFFIUpCallTargets();\n");
+            w.append("    protected static CallTarget createCallTarget(InteropLibrary interopLib) {\n");
+            w.append("        RContext ctx = RContext.getInstance(interopLib);\n");
+            w.append("        RFFIUpCallTargets targets = ctx.getRFFIUpCallTargets();\n");
             w.append("        if(targets.").append(nodeClassName).append(" == null) {\n");
             w.append("            targets.").append(nodeClassName).append(" =  new NodeRootNode().getCallTarget();\n");
             w.append("        }\n");