Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'truffle-head' into truffle-new-instrumentation
Browse files Browse the repository at this point in the history 
# Conflicts:
#	truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java
@chrisseaton
chrisseaton committed Feb 6, 2016
2 parents d4a091d + 308a601 commit dc62fb4
Showing 79 changed files with 204 additions and 107 deletions.
3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,9 @@
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.rope.RopeTable;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.symbol.SymbolTable;
import org.jruby.truffle.core.thread.ThreadManager;
import org.jruby.truffle.extra.AttachmentsManager;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.platform.TrufflePOSIXHandler;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/RubyLanguage.java
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
import org.jruby.Ruby;
import org.jruby.RubyInstanceConfig;
import org.jruby.runtime.Constants;
import org.jruby.truffle.core.AttachmentsManager;
import org.jruby.truffle.extra.AttachmentsManager;
import org.jruby.truffle.language.LazyRubyRootNode;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ClassLayout.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.module.ModuleFields;
import org.jruby.truffle.core.module.ModuleLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;

3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ClassNodes.java
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@
import com.oracle.truffle.api.object.ObjectType;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.core.module.ModuleFields;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
19 changes: 18 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -30,15 +30,32 @@
import org.jruby.ext.ffi.Platform.OS_TYPE;
import org.jruby.runtime.Constants;
import org.jruby.runtime.encoding.EncodingService;
import org.jruby.truffle.core.encoding.EncodingConverterNodesFactory;
import org.jruby.truffle.core.encoding.EncodingNodes;
import org.jruby.truffle.core.encoding.EncodingNodesFactory;
import org.jruby.truffle.core.encoding.EncodingOperations;
import org.jruby.truffle.core.fiber.FiberNodesFactory;
import org.jruby.truffle.core.method.MethodNodesFactory;
import org.jruby.truffle.core.method.UnboundMethodNodesFactory;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.core.numeric.BignumNodesFactory;
import org.jruby.truffle.core.numeric.FixnumNodesFactory;
import org.jruby.truffle.core.numeric.FloatNodesFactory;
import org.jruby.truffle.core.numeric.IntegerNodesFactory;
import org.jruby.truffle.core.range.RangeNodesFactory;
import org.jruby.truffle.core.regexp.MatchDataNodesFactory;
import org.jruby.truffle.core.regexp.RegexpNodesFactory;
import org.jruby.truffle.core.string.StringNodesFactory;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.symbol.SymbolNodesFactory;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationLayoutImpl;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationNodesFactory;
import org.jruby.truffle.core.thread.ThreadNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.array.ArrayNodes;
import org.jruby.truffle.core.array.ArrayNodesFactory;
import org.jruby.truffle.core.fixnum.FixnumNodesFactory;
import org.jruby.truffle.core.hash.HashNodesFactory;
import org.jruby.truffle.stdlib.BigDecimalNodesFactory;
import org.jruby.truffle.stdlib.DigestNodesFactory;
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
@@ -18,11 +18,11 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.numeric.FixnumLowerNodeGen;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.*;
import org.jruby.truffle.core.cast.TaintResultNode;
import org.jruby.truffle.language.control.SequenceNode;
import org.jruby.truffle.core.fixnum.FixnumLowerNodeGen;
import org.jruby.truffle.language.methods.ExceptionTranslatingNode;
import org.jruby.truffle.language.objects.SelfNode;
import org.jruby.truffle.language.objects.SingletonClassNode;
6 changes: 5 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -30,10 +30,14 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.encoding.EncodingNodes;
import org.jruby.truffle.core.encoding.EncodingOperations;
import org.jruby.truffle.core.format.parser.PrintfCompiler;
import org.jruby.truffle.core.format.runtime.PackResult;
import org.jruby.truffle.core.format.runtime.exceptions.*;
import org.jruby.truffle.core.method.MethodFilter;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationLayoutImpl;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen;
@@ -67,7 +71,7 @@
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.language.methods.SharedMethodInfo;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.language.translator.TranslatorDriver;
import org.jruby.truffle.language.translator.TranslatorDriver.ParserContext;
import org.jruby.util.ByteList;
19 changes: 19 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/Layouts.java
View file
Original file line number Diff line number Diff line change
@@ -12,14 +12,33 @@
import com.oracle.truffle.api.object.HiddenKey;
import org.jruby.truffle.core.array.ArrayLayout;
import org.jruby.truffle.core.array.ArrayLayoutImpl;
import org.jruby.truffle.core.encoding.EncodingConverterLayout;
import org.jruby.truffle.core.encoding.EncodingConverterLayoutImpl;
import org.jruby.truffle.core.encoding.EncodingLayout;
import org.jruby.truffle.core.encoding.EncodingLayoutImpl;
import org.jruby.truffle.core.fiber.FiberLayout;
import org.jruby.truffle.core.fiber.FiberLayoutImpl;
import org.jruby.truffle.core.hash.HashLayout;
import org.jruby.truffle.core.hash.HashLayoutImpl;
import org.jruby.truffle.core.method.MethodLayout;
import org.jruby.truffle.core.method.MethodLayoutImpl;
import org.jruby.truffle.core.method.UnboundMethodLayout;
import org.jruby.truffle.core.method.UnboundMethodLayoutImpl;
import org.jruby.truffle.core.module.ModuleLayout;
import org.jruby.truffle.core.module.ModuleLayoutImpl;
import org.jruby.truffle.core.numeric.BignumLayout;
import org.jruby.truffle.core.numeric.BignumLayoutImpl;
import org.jruby.truffle.core.range.*;
import org.jruby.truffle.core.regexp.MatchDataLayout;
import org.jruby.truffle.core.regexp.MatchDataLayoutImpl;
import org.jruby.truffle.core.regexp.RegexpLayout;
import org.jruby.truffle.core.regexp.RegexpLayoutImpl;
import org.jruby.truffle.core.string.StringLayout;
import org.jruby.truffle.core.string.StringLayoutImpl;
import org.jruby.truffle.core.symbol.SymbolLayout;
import org.jruby.truffle.core.symbol.SymbolLayoutImpl;
import org.jruby.truffle.core.thread.ThreadLayout;
import org.jruby.truffle.core.thread.ThreadLayoutImpl;
import org.jruby.truffle.stdlib.BigDecimalLayout;
import org.jruby.truffle.stdlib.BigDecimalLayoutImpl;
import org.jruby.truffle.stdlib.psych.EmitterLayout;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.RubyContext;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/MutexNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;

import java.util.concurrent.locks.ReentrantLock;

2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ObjectSpaceManager.java
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
import com.oracle.truffle.api.utilities.CyclicAssumption;
import org.jruby.RubyGC;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.thread.ThreadManager;
import org.jruby.truffle.core.thread.ThreadNodes;
import org.jruby.truffle.language.control.RaiseException;

import java.lang.ref.ReferenceQueue;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/PrependMarker.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.module.IncludedModule;
import org.jruby.truffle.language.ModuleChain;

public class PrependMarker implements ModuleChain {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/QueueNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.util.MethodHandleUtils;

import java.lang.invoke.MethodHandle;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/SizedQueueNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.util.MethodHandleUtils;

import java.lang.invoke.MethodHandle;
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
@@ -32,6 +32,7 @@
import org.jruby.truffle.core.format.parser.PackCompiler;
import org.jruby.truffle.core.format.runtime.PackResult;
import org.jruby.truffle.core.format.runtime.exceptions.*;
import org.jruby.truffle.core.numeric.FixnumLowerNodeGen;
import org.jruby.truffle.core.rope.*;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
@@ -43,7 +44,6 @@
import org.jruby.truffle.core.coerce.ToIntNode;
import org.jruby.truffle.core.coerce.ToIntNodeGen;
import org.jruby.truffle.core.*;
import org.jruby.truffle.core.fixnum.FixnumLowerNodeGen;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.language.dispatch.MissingBehavior;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/PrimitiveArrayNodeFactory.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.fixnum.FixnumLiteralNode;
import org.jruby.truffle.core.numeric.FixnumLiteralNode;
import org.jruby.truffle.RubyContext;

public abstract class PrimitiveArrayNodeFactory {
6 changes: 2 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/coerce/ToIntNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,6 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/


package org.jruby.truffle.core.coerce;

import com.oracle.truffle.api.CompilerDirectives;
@@ -18,10 +16,10 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.core.numeric.FloatNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.FloatNodes;
import org.jruby.truffle.core.FloatNodesFactory;
import org.jruby.truffle.core.numeric.FloatNodes;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.RubyContext;
3 changes: 2 additions & 1 deletion ...truffle/core/EncodingConverterLayout.java → ...ore/encoding/EncodingConverterLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.encoding;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jcodings.transcode.EConv;
import org.jruby.truffle.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;

3 changes: 2 additions & 1 deletion .../truffle/core/EncodingConverterNodes.java → ...core/encoding/EncodingConverterNodes.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.encoding;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
@@ -24,6 +24,7 @@
import org.jruby.Ruby;
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.core.*;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.RubyContext;
3 changes: 2 additions & 1 deletion ...rg/jruby/truffle/core/EncodingLayout.java → ...truffle/core/encoding/EncodingLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.encoding;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jcodings.Encoding;
import org.jruby.truffle.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import org.jruby.util.ByteList;
4 changes: 3 additions & 1 deletion ...org/jruby/truffle/core/EncodingNodes.java → .../truffle/core/encoding/EncodingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.encoding;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -22,7 +22,9 @@
import org.jcodings.specific.UTF8Encoding;
import org.jcodings.util.CaseInsensitiveBytesHash;
import org.jcodings.util.Hash;
import org.jruby.truffle.core.*;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.symbol.SymbolNodes;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.core.coerce.ToStrNode;
import org.jruby.truffle.core.coerce.ToStrNodeGen;
3 changes: 2 additions & 1 deletion ...ruby/truffle/core/EncodingOperations.java → ...fle/core/encoding/EncodingOperations.java
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,14 @@
* Some of the code in this class is transposed from org.jruby.runtime.encoding.EncodingService,
* licensed under the same EPL1.0/GPL 2.0/LGPL 2.1 used throughout.
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.encoding;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jcodings.Encoding;
import org.jcodings.EncodingDB;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;

public abstract class EncodingOperations {
3 changes: 2 additions & 1 deletion ...a/org/jruby/truffle/core/FiberLayout.java → ...jruby/truffle/core/fiber/FiberLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,11 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.fiber;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import org.jruby.truffle.om.dsl.api.Volatile;
3 changes: 2 additions & 1 deletion .../org/jruby/truffle/core/FiberManager.java → ...ruby/truffle/core/fiber/FiberManager.java
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,11 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.fiber;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.RubyContext;

Loading

0 comments on commit dc62fb4

Please sign in to comment.