Skip to content

Commit 1bdbda7

Browse files
author
Pavel Marek
committed
Fix style
(cherry picked from commit 863439e)
1 parent 6fbcb83 commit 1bdbda7

File tree

2 files changed

+11
-9
lines changed
  • com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes
  • com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi

2 files changed

+11
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public static RfAllocArrayNode create() {
4242

4343
@Specialization(guards = "mode == type.code", limit = "getGenericDataLibraryCacheSize()")
4444
protected static Object allocArrayCached(@SuppressWarnings("unused") int mode, RIntVector dims,
45-
@Cached(value = "getType(mode)", allowUncached = true) SEXPTYPE type,
46-
@CachedLibrary("dims.getData()") VectorDataLibrary dimsDataLib,
47-
@Cached SetDimAttributeNode setDimNode) {
45+
@Cached(value = "getType(mode)", allowUncached = true) SEXPTYPE type,
46+
@CachedLibrary("dims.getData()") VectorDataLibrary dimsDataLib,
47+
@Cached SetDimAttributeNode setDimNode) {
4848
CompilerAsserts.compilationConstant(type);
4949
return allocArray(dims, dimsDataLib, type, setDimNode);
5050
}

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFILog.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@
2626
import com.oracle.truffle.api.TruffleLogger;
2727
import com.oracle.truffle.r.runtime.Collections;
2828
import com.oracle.truffle.r.runtime.RLogger;
29-
import com.oracle.truffle.r.runtime.context.RContext;
30-
31-
import java.util.concurrent.atomic.AtomicInteger;
32-
import java.util.logging.Level;
3329
import com.oracle.truffle.r.runtime.Utils;
30+
import com.oracle.truffle.r.runtime.context.RContext;
3431
import com.oracle.truffle.r.runtime.data.RBaseObject;
35-
import java.util.List;
36-
import static com.oracle.truffle.r.runtime.RLogger.LOGGER_RFFI;
3732
import com.oracle.truffle.r.runtime.data.RPairList;
3833
import org.graalvm.collections.EconomicMap;
3934
import org.graalvm.collections.MapCursor;
4035

36+
import java.util.List;
37+
import java.util.concurrent.atomic.AtomicInteger;
38+
import java.util.logging.Level;
39+
40+
import static com.oracle.truffle.r.runtime.RLogger.LOGGER_RFFI;
41+
4142
/**
4243
* Support for logging R FFI.
4344
*
@@ -80,6 +81,7 @@ public static void logRObject(String message, Object obj) {
8081
log(message + " " + rObjectToDebugString(obj));
8182
}
8283

84+
@TruffleBoundary
8385
private static String rObjectToDebugString(Object obj) {
8486
Object mirror = obj instanceof RBaseObject ? ((RBaseObject) obj).getNativeMirror() : null;
8587
return String.format("[%s, native mirror: %s]", Utils.getDebugInfo(obj), mirror);

0 commit comments

Comments
 (0)