Skip to content

Commit

Permalink
Merge branch 'master' into truffle-head
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed Feb 15, 2016
2 parents 38e1f20 + 49b4350 commit 9e070c9
Showing 21 changed files with 17 additions and 27 deletions.
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
import org.jruby.truffle.core.CoreLibrary;
import org.jruby.truffle.core.kernel.AtExitManager;
import org.jruby.truffle.core.kernel.TraceManager;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.core.objectspace.ObjectSpaceManager;
import org.jruby.truffle.core.rope.RopeTable;
import org.jruby.truffle.core.rubinius.RubiniusPrimitiveManager;
@@ -30,7 +31,6 @@
import org.jruby.truffle.interop.InteropManager;
import org.jruby.truffle.interop.JRubyInterop;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.language.Options;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.SafepointManager;
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/RubyLanguage.java
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,6 @@
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.instrument.Visualizer;
import com.oracle.truffle.api.instrument.WrapperNode;
import com.oracle.truffle.api.interop.ForeignAccess;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.source.Source;
import org.jruby.Ruby;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
View file
Original file line number Diff line number Diff line change
@@ -20,9 +20,9 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.core.cast.TaintResultNode;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.core.numeric.FixnumLowerNodeGen;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.RubyConstant;
import org.jruby.truffle.language.RubyGuards;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -63,12 +63,12 @@
import org.jruby.truffle.core.rope.RopeNodes;
import org.jruby.truffle.core.rope.RopeNodesFactory;
import org.jruby.truffle.core.rope.ValidLeafRope;
import org.jruby.truffle.core.string.StringCachingGuards;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.core.string.StringCachingGuards;
import org.jruby.truffle.language.arguments.MissingArgumentBehaviour;
import org.jruby.truffle.language.arguments.ReadPreArgumentNode;
import org.jruby.truffle.language.arguments.RubyArguments;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectNodes.java
View file
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.core.array.ArrayHelpers;
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.control.RaiseException;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.core.array.ArrayHelpers;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.objects.ThreadLocalObject;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.locals.ReadFrameSlotNode;
@@ -37,6 +36,7 @@
import org.jruby.truffle.language.locals.WriteFrameSlotNodeGen;
import org.jruby.truffle.language.objects.AllocateObjectNode;
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
import org.jruby.truffle.language.objects.ThreadLocalObject;

import java.util.ArrayList;
import java.util.List;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -82,6 +82,7 @@
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.rubinius.ObjectPrimitiveNodes;
import org.jruby.truffle.core.rubinius.ObjectPrimitiveNodesFactory;
import org.jruby.truffle.core.string.StringCachingGuards;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.symbol.SymbolTable;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationLayoutImpl;
@@ -91,8 +92,6 @@
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.core.string.StringCachingGuards;
import org.jruby.truffle.language.objects.ThreadLocalObject;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.language.backtrace.Activation;
import org.jruby.truffle.language.backtrace.Backtrace;
@@ -124,6 +123,7 @@
import org.jruby.truffle.language.objects.SingletonClassNodeGen;
import org.jruby.truffle.language.objects.TaintNode;
import org.jruby.truffle.language.objects.TaintNodeGen;
import org.jruby.truffle.language.objects.ThreadLocalObject;
import org.jruby.truffle.language.objects.WriteHeadObjectFieldNode;
import org.jruby.truffle.language.objects.WriteHeadObjectFieldNodeGen;
import org.jruby.truffle.language.translator.TranslatorDriver;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusLastStringWriteNode.java
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyCallStack;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.objects.ThreadLocalObject;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.language.objects.ThreadLocalObject;

@NodeChild(value = "value", type = RubyNode.class)
public abstract class RubiniusLastStringWriteNode extends RubyNode {
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/string/StringCachingGuards.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@

import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;

public abstract class StringCachingGuards {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/interop/InteropNode.java
View file
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.arguments.RubyArguments;
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/interop/JRubyInterop.java
View file
Original file line number Diff line number Diff line change
@@ -13,13 +13,9 @@
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.loader.SourceLoader;

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java
View file
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.string.StringCachingGuards;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.util.ByteList;
import org.jruby.util.StringSupport;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.language.RubyConstant;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.control.RaiseException;
2 changes: 1 addition & 1 deletion ...rc/main/java/org/jruby/truffle/language/constants/LookupConstantWithLexicalScopeNode.java
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.language.RubyConstant;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.control.RaiseException;
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/jruby/truffle/language/globals/ReadThreadLocalGlobalVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.objects.ThreadLocalObjectNode;
import org.jruby.truffle.language.objects.ReadHeadObjectFieldNode;
import org.jruby.truffle.language.objects.ReadHeadObjectFieldNodeGen;
import org.jruby.truffle.language.objects.ThreadLocalObjectNode;

public class ReadThreadLocalGlobalVariableNode extends RubyNode {

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyConstant;
import org.jruby.truffle.language.control.RaiseException;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/language/objects/ReadClassVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.control.RaiseException;
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/language/objects/ShapeCachingGuards.java
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,6 @@

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.Shape;
import org.jruby.truffle.core.Layouts;

public abstract class ShapeCachingGuards {

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/language/objects/WriteClassVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.language.RubyNode;

public class WriteClassVariableNode extends RubyNode {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,6 @@
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.language.objects.ThreadLocalObjectNode;
import org.jruby.truffle.language.arguments.ArrayIsAtLeastAsLargeAsNode;
import org.jruby.truffle.language.arguments.IsRubiniusUndefinedNode;
import org.jruby.truffle.language.constants.ReadConstantWithLexicalScopeNode;
@@ -157,6 +156,7 @@
import org.jruby.truffle.language.objects.SelfNode;
import org.jruby.truffle.language.objects.SingletonClassNode;
import org.jruby.truffle.language.objects.SingletonClassNodeGen;
import org.jruby.truffle.language.objects.ThreadLocalObjectNode;
import org.jruby.truffle.language.objects.WriteClassVariableNode;
import org.jruby.truffle.language.objects.WriteInstanceVariableNode;
import org.jruby.truffle.language.yield.YieldNode;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/platform/java/JavaMemoryManager.java
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
package org.jruby.truffle.platform.java;

import jnr.ffi.Pointer;
import jnr.ffi.provider.InAccessibleMemoryIO;
import jnr.ffi.provider.MemoryManager;
import jnr.ffi.provider.NullMemoryIO;

0 comments on commit 9e070c9

Please sign in to comment.