Skip to content

Commit

Permalink
[Truffle] Set a 7-bit code range for Strings we know only have ASCII …
Browse files Browse the repository at this point in the history 
…chars.
@nirvdrum
nirvdrum committed Aug 24, 2015
1 parent 58c5732 commit 34ec948
Showing 27 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ public RubyNode(RubyContext context, SourceSection sourceSection) {
public abstract Object execute(VirtualFrame frame);

public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(getContext().getCoreLibrary().getStringClass()), RubyString.encodeBytelist("expression", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(getContext().getCoreLibrary().getStringClass()), RubyString.encodeBytelist("expression", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

// Execute without returning the result
2 changes: 1 addition & 1 deletion ...fle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantWithLexicalScopeNode.java
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ public Object isDefined(VirtualFrame frame) {
if (constant == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("constant", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("constant", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadLiteralConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ public Object isDefined(VirtualFrame frame) {
if (constant == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("constant", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("constant", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/control/TraceNode.java
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ public TraceNode(RubyContext context, SourceSection sourceSection) {
traceAssumption = context.getTraceManager().getTraceAssumption();
traceFunc = null;
callNode = null;
event = Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("line", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
event = Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("line", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
file = Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist(sourceSection.getSource().getName(), UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
line = sourceSection.getStartLine();
}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -200,7 +200,7 @@ public boolean equal(VirtualFrame frame, DynamicObject a, Object b) {
respondToNode = insert(KernelNodesFactory.RespondToNodeFactory.create(getContext(), getSourceSection(), null, null, null));
}

if (respondToNode.doesRespondToString(frame, b, Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(getContext().getCoreLibrary().getStringClass()), RubyString.encodeBytelist("to_str", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null), false)) {
if (respondToNode.doesRespondToString(frame, b, Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(getContext().getCoreLibrary().getStringClass()), RubyString.encodeBytelist("to_str", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null), false)) {
if (objectEqualNode == null) {
CompilerDirectives.transferToInterpreter();
objectEqualNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -308,7 +308,7 @@ public Object mulObjectCount(VirtualFrame frame, DynamicObject array, Object obj
CompilerDirectives.transferToInterpreter();
respondToToStrNode = insert(KernelNodesFactory.RespondToNodeFactory.create(getContext(), getSourceSection(), null, null, null));
}
if (respondToToStrNode.doesRespondToString(frame, object, Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("to_str", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null), false)) {
if (respondToToStrNode.doesRespondToString(frame, object, Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("to_str", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null), false)) {
return ruby(frame, "join(sep.to_str)", "sep", object);
} else {
if (toIntNode == null) {
@@ -1487,7 +1487,7 @@ public DynamicObject initialize(VirtualFrame frame, DynamicObject array, Object
CompilerDirectives.transferToInterpreter();
respondToToAryNode = insert(KernelNodesFactory.RespondToNodeFactory.create(getContext(), getSourceSection(), null, null, null));
}
if (respondToToAryNode.doesRespondToString(frame, object, Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("to_ary", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null), true)) {
if (respondToToAryNode.doesRespondToString(frame, object, Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("to_ary", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null), true)) {
if (toAryNode == null) {
CompilerDirectives.transferToInterpreter();
toAryNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true));
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/dispatch/RubyCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -397,7 +397,7 @@ public Object isDefined(VirtualFrame frame) {
return nil();
}

return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("method", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("method", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

public String getName() {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/globals/ReadLastBacktraceNode.java
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ public ReadLastBacktraceNode(RubyContext context, SourceSection sourceSection) {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

@Override
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/globals/ReadMatchReferenceNode.java
View file
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ private Object readMatchReference() {
@Override
public Object isDefined(VirtualFrame frame) {
if (execute(frame) != nil()) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else {
return nil();
}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/literal/NilNode.java
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ public Object execute(VirtualFrame frame) {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("nil", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("nil", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

}
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/locals/ReadDeclarationVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -60,12 +60,12 @@ public Object isDefined(VirtualFrame frame) {
if (Translator.FRAME_LOCAL_GLOBAL_VARIABLES.contains(readFrameSlotNode.getFrameSlot().getIdentifier())) {
if (ALWAYS_DEFINED_GLOBALS.contains(readFrameSlotNode.getFrameSlot().getIdentifier())
|| readFrameSlotNode.executeRead(RubyArguments.getDeclarationFrame(frame, frameDepth)) != nil()) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else {
return nil();
}
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("local-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("local-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/locals/ReadLocalVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -50,12 +50,12 @@ public Object isDefined(VirtualFrame frame) {
if (Translator.FRAME_LOCAL_GLOBAL_VARIABLES.contains(readFrameSlotNode.getFrameSlot().getIdentifier())) {
if (Translator.ALWAYS_DEFINED_GLOBALS.contains(readFrameSlotNode.getFrameSlot().getIdentifier())
|| readFrameSlotNode.executeRead(frame) != nil()) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else {
return nil();
}
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("local-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("local-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/locals/WriteDeclarationVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ public RubyNode makeReadNode() {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/locals/WriteLocalVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ public RubyNode makeReadNode() {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadClassVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ public Object isDefined(VirtualFrame frame) {
if (value == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("class variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("class variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -103,12 +103,12 @@ public Object isDefined(VirtualFrame frame) {
final DynamicObject receiverValue = (DynamicObject) receiver.execute(frame);

if (readNode.getName().equals("$~") || readNode.getName().equals("$!")) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else if (readNode.isSet(receiverValue)) {
if (readNode.execute(receiverValue) == nil()) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
} else {
return nil();
@@ -124,7 +124,7 @@ public Object isDefined(VirtualFrame frame) {
final Property storageLocation = layout.getProperty(readNode.getName());

if (storageLocation != null) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("instance-variable", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("instance-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else {
return nil();
}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/objects/SelfNode.java
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ public Object execute(VirtualFrame frame) {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("self", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("self", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/objects/WriteClassVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ public Object execute(VirtualFrame frame) {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/objects/WriteInstanceVariableNode.java
View file
Original file line number Diff line number Diff line change
@@ -121,7 +121,7 @@ public RubyNode makeReadNode() {

@Override
public Object isDefined(VirtualFrame frame) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("assignment", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

}
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/rubinius/DirPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -121,9 +121,9 @@ public Object read(DynamicObject dir) {
Layouts.DIR.setPosition(dir, position + 1);

if (position == -2) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist(".", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist(".", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else if (position == -1) {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("..", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("..", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
} else {
final String[] contents = (String[]) Layouts.DIR.getContents(dir);

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java
View file
Original file line number Diff line number Diff line change
@@ -859,7 +859,7 @@ public GetAddrInfoNode(RubyContext context, SourceSection sourceSection) {
@CompilerDirectives.TruffleBoundary
@Specialization(guards = {"isNil(hostName)", "isRubyString(serviceName)"})
public int getaddrinfoNil(DynamicObject hostName, DynamicObject serviceName, DynamicObject hintsPointer, DynamicObject resultsPointer) {
return getaddrinfoString(Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("0.0.0.0", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null), serviceName, hintsPointer, resultsPointer);
return getaddrinfoString(Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("0.0.0.0", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null), serviceName, hintsPointer, resultsPointer);
}

@CompilerDirectives.TruffleBoundary
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ public Object isDefined(VirtualFrame frame) {
if (superMethod == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("super", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("super", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -118,7 +118,7 @@ public Object isDefined(VirtualFrame frame) {
if (superMethod == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("super", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("super", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/supercall/ZSuperOutsideMethodNode.java
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ public Object isDefined(VirtualFrame frame) {
if (superMethod == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("super", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("super", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/time/ReadTimeZoneNode.java
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ public ReadTimeZoneNode(RubyContext context, SourceSection sourceSection) {
hashNode = DispatchHeadNodeFactory.createMethodCall(context);
envNode = new ReadLiteralConstantNode(context, sourceSection,
new LiteralNode(context, sourceSection, getContext().getCoreLibrary().getObjectClass()), "ENV");
TZ = Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("TZ", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
TZ = Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("TZ", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}

@Override
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/yield/YieldNode.java
View file
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ public Object isDefined(VirtualFrame frame) {
if (RubyArguments.getBlock(frame.getArguments()) == null) {
return nil();
} else {
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("yield", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("yield", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
}
}

8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/runtime/rubinius/DefaultRubiniusConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -156,10 +156,10 @@ public static void load(RubiniusConfiguration configuration, RubyContext context
configuration.config("rbx.platform.io.SEEK_CUR", 1);
configuration.config("rbx.platform.io.SEEK_END", 2);

configuration.config("rbx.platform.socket.AI_PASSIVE", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("1", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null));
configuration.config("rbx.platform.socket.AF_UNSPEC", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("0", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null));
configuration.config("rbx.platform.socket.SOCK_STREAM", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("1", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null));
configuration.config("rbx.platform.socket.SOCK_STREAM", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("1", UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null));
configuration.config("rbx.platform.socket.AI_PASSIVE", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("1", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null));
configuration.config("rbx.platform.socket.AF_UNSPEC", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("0", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null));
configuration.config("rbx.platform.socket.SOCK_STREAM", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("1", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null));
configuration.config("rbx.platform.socket.SOCK_STREAM", Layouts.STRING.createString(Layouts.CLASS.getInstanceFactory(context.getCoreLibrary().getStringClass()), RubyString.encodeBytelist("1", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null));
}

protected static DynamicObject newBignum(RubyContext context, String value) {

0 comments on commit 34ec948

Please sign in to comment.