Skip to content

Commit 4be4645

Browse files
committed
Move thread_allocate next to thread_initialize
1 parent 6081d43 commit 4be4645

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

src/main/java/org/truffleruby/core/thread/ThreadNodes.java

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,16 @@
4040
*/
4141
package org.truffleruby.core.thread;
4242

43-
import java.util.concurrent.CountDownLatch;
44-
import java.util.concurrent.TimeUnit;
45-
43+
import com.oracle.truffle.api.CompilerDirectives;
44+
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
45+
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
46+
import com.oracle.truffle.api.dsl.Cached;
47+
import com.oracle.truffle.api.dsl.Specialization;
48+
import com.oracle.truffle.api.frame.VirtualFrame;
49+
import com.oracle.truffle.api.nodes.Node;
50+
import com.oracle.truffle.api.object.DynamicObject;
51+
import com.oracle.truffle.api.profiles.BranchProfile;
52+
import com.oracle.truffle.api.source.SourceSection;
4653
import org.jcodings.specific.USASCIIEncoding;
4754
import org.jcodings.specific.UTF8Encoding;
4855
import org.truffleruby.Layouts;
@@ -76,16 +83,8 @@
7683
import org.truffleruby.language.objects.shared.SharedObjects;
7784
import org.truffleruby.language.yield.YieldNode;
7885

79-
import com.oracle.truffle.api.CompilerDirectives;
80-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
81-
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
82-
import com.oracle.truffle.api.dsl.Cached;
83-
import com.oracle.truffle.api.dsl.Specialization;
84-
import com.oracle.truffle.api.frame.VirtualFrame;
85-
import com.oracle.truffle.api.nodes.Node;
86-
import com.oracle.truffle.api.object.DynamicObject;
87-
import com.oracle.truffle.api.profiles.BranchProfile;
88-
import com.oracle.truffle.api.source.SourceSection;
86+
import java.util.concurrent.CountDownLatch;
87+
import java.util.concurrent.TimeUnit;
8988

9089
@CoreClass("Thread")
9190
public abstract class ThreadNodes {
@@ -244,6 +243,18 @@ private DynamicObject getNeverSymbol() {
244243

245244
}
246245

246+
@Primitive(name = "thread_allocate")
247+
public abstract static class ThreadAllocateNode extends PrimitiveArrayArgumentsNode {
248+
249+
@Specialization
250+
public DynamicObject allocate(
251+
DynamicObject rubyClass,
252+
@Cached("create()") AllocateObjectNode allocateObjectNode) {
253+
return getContext().getThreadManager().createThread(rubyClass, allocateObjectNode);
254+
}
255+
256+
}
257+
247258
@Primitive(name = "thread_initialized?")
248259
public abstract static class ThreadIsInitializedNode extends PrimitiveArrayArgumentsNode {
249260

@@ -487,18 +498,6 @@ public DynamicObject setAbortOnException(DynamicObject self, boolean abortOnExce
487498

488499
}
489500

490-
@Primitive(name = "thread_allocate")
491-
public abstract static class ThreadAllocateNode extends PrimitiveArrayArgumentsNode {
492-
493-
@Specialization
494-
public DynamicObject allocate(
495-
DynamicObject rubyClass,
496-
@Cached("create()") AllocateObjectNode allocateObjectNode) {
497-
return getContext().getThreadManager().createThread(rubyClass, allocateObjectNode);
498-
}
499-
500-
}
501-
502501
@CoreMethod(names = "list", onSingleton = true)
503502
public abstract static class ListNode extends CoreMethodArrayArgumentsNode {
504503

0 commit comments

Comments
 (0)