From 3225595a53dbdbf6865e49ea83dd8a8e5b971206 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Thu, 21 Sep 2017 12:11:16 +0200
Subject: [PATCH] use upcall for str2type and simulate DllInfo layout
---
.../src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java
index de9ff2b821..ca135af186 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/NativeDataAccess.java
@@ -202,7 +202,7 @@ public final class NativeDataAccess {
@TruffleBoundary
private static NativeMirror putMirrorObject(Object arg, RObject obj) {
- NativeMirror mirror;
+ NativeMirror mirror;
obj.setNativeMirror(mirror = arg instanceof CustomNativeMirror ? new NativeMirror(((CustomNativeMirror) arg).getCustomMirrorAddress()) : new NativeMirror());
// System.out.println(String.format("adding %16x = %s", mirror.id,
// obj.getClass().getSimpleName()));
--
GitLab