Skip to content

Commit

Permalink
Showing 27 changed files with 58 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -954,7 +954,7 @@ public void loadRubyCore() {
Main.printTruffleTimeMetric("before-load-core");
state = State.LOADING_RUBY_CORE;

@SuppressWarnings("unchecked")
@SuppressWarnings({ "rawtypes", "unchecked" })
final Future<RubyRootNode>[] coreFileFutures = new Future[coreFiles.length];

try {
Original file line number Diff line number Diff line change
@@ -11,4 +11,6 @@

public class CantCompressNegativeException extends FormatException {

private static final long serialVersionUID = 3584862629702748827L;

}
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

public class CantConvertException extends FormatException {

private static final long serialVersionUID = -1748812990145250644L;

public CantConvertException(String message) {
super(message);
}
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public class FormatException extends ControlFlowException {

private static final long serialVersionUID = -6570764260422083237L;

private final String message;

public FormatException() {
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

public class InvalidFormatException extends FormatException {

private static final long serialVersionUID = -6689191131430505495L;

public InvalidFormatException(String message) {
super(message);
}
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

public class NoImplicitConversionException extends FormatException {

private static final long serialVersionUID = -2509958825294561087L;

private final Object object;
private final String target;

Original file line number Diff line number Diff line change
@@ -11,4 +11,6 @@

public class OutsideOfStringException extends FormatException {

private static final long serialVersionUID = -4122128522293680018L;

}
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

public class RangeException extends FormatException {

private static final long serialVersionUID = -6312025908880011931L;

public RangeException(String message) {
super(message);
}
Original file line number Diff line number Diff line change
@@ -11,4 +11,6 @@

public class TooFewArgumentsException extends FormatException {

private static final long serialVersionUID = 425804306436596616L;

}
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ public PrintfSimpleParser(char[] source) {
this.source = source;
}

@SuppressWarnings("fallthrough")
public List<SprintfConfig> parse() {
List<SprintfConfig> configs = new ArrayList<>();
ArgType argType = ArgType.NONE;
Original file line number Diff line number Diff line change
@@ -419,6 +419,8 @@ public void accept(byte[] bytes, int offset, int length) {
public static abstract class IOWriteNonBlockPrimitiveNode extends IOPrimitiveArrayArgumentsNode {

static class StopWriting extends ControlFlowException {
private static final long serialVersionUID = 1096318435617097172L;

final int bytesWritten;

public StopWriting(int bytesWritten) {
Original file line number Diff line number Diff line change
@@ -193,6 +193,7 @@ private void figureOutBase() {
}
}

@SuppressWarnings("fallthrough")
private int calculateLength() {
int len = 0;
byte second = ((str+1 < end) && data[str] == '0') ? data[str+1] : (byte)0;
@@ -537,6 +538,8 @@ private BigInteger stringToBig(String str) {
}

public static class ERange extends RuntimeException {
private static final long serialVersionUID = 3393153027217708024L;

public static enum Kind {Overflow, Underflow};
private ConvertBytes.ERange.Kind kind;
public ERange() {
Original file line number Diff line number Diff line change
@@ -24,19 +24,19 @@ DynamicObjectFactory createTracePointShape(DynamicObject logicalClass,

DynamicObject createTracePoint(
DynamicObjectFactory factory,
@Nullable Class[] tags,
@Nullable Object[] tags,
@Nullable DynamicObject event,
@Nullable DynamicObject path,
int line,
@Nullable DynamicObject binding,
@Nullable DynamicObject proc,
@Nullable EventBinding eventBinding,
@Nullable Object eventBinding,
boolean insideProc);

boolean isTracePoint(DynamicObject object);

Class[] getTags(DynamicObject object);
void setTags(DynamicObject object, Class[] value);
Object[] getTags(DynamicObject object);
void setTags(DynamicObject object, Object[] value);

DynamicObject getEvent(DynamicObject object);
void setEvent(DynamicObject object, DynamicObject value);
@@ -53,8 +53,8 @@ DynamicObject createTracePoint(
DynamicObject getProc(DynamicObject object);
void setProc(DynamicObject object, DynamicObject value);

EventBinding getEventBinding(DynamicObject object);
void setEventBinding(DynamicObject object, EventBinding value);
Object getEventBinding(DynamicObject object);
void setEventBinding(DynamicObject object, Object value);

boolean getInsideProc(DynamicObject object);
void setInsideProc(DynamicObject object, boolean value);
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ public boolean enable(VirtualFrame frame, DynamicObject tracePoint, NotProvided

@Specialization(guards = "isTracePoint(tracePoint)")
public boolean enable(VirtualFrame frame, DynamicObject tracePoint, DynamicObject block) {
EventBinding<?> eventBinding = Layouts.TRACE_POINT.getEventBinding(tracePoint);
EventBinding<?> eventBinding = (EventBinding<?>) Layouts.TRACE_POINT.getEventBinding(tracePoint);
final boolean alreadyEnabled = eventBinding != null;

if (!alreadyEnabled) {
@@ -106,7 +106,7 @@ public boolean enable(VirtualFrame frame, DynamicObject tracePoint, DynamicObjec

@TruffleBoundary
public static EventBinding<?> createEventBinding(final RubyContext context, final DynamicObject tracePoint) {
return context.getInstrumenter().attachFactory(SourceSectionFilter.newBuilder().tagIs(Layouts.TRACE_POINT.getTags(tracePoint)).build(), new ExecutionEventNodeFactory() {
return context.getInstrumenter().attachFactory(SourceSectionFilter.newBuilder().tagIs((Class<?>[]) Layouts.TRACE_POINT.getTags(tracePoint)).build(), new ExecutionEventNodeFactory() {
@Override
public ExecutionEventNode create(EventContext eventContext) {
return new TracePointEventNode(context, tracePoint);
@@ -135,7 +135,7 @@ public boolean disable(VirtualFrame frame, DynamicObject tracePoint, NotProvided

@Specialization(guards = "isTracePoint(tracePoint)")
public boolean disable(VirtualFrame frame, DynamicObject tracePoint, DynamicObject block) {
EventBinding<?> eventBinding = Layouts.TRACE_POINT.getEventBinding(tracePoint);
EventBinding<?> eventBinding = (EventBinding<?>) Layouts.TRACE_POINT.getEventBinding(tracePoint);
final boolean alreadyEnabled = eventBinding != null;

if (alreadyEnabled) {
Original file line number Diff line number Diff line change
@@ -531,8 +531,8 @@ private static int streamtoword(byte data[], int offp[]) {
* Initialise the Blowfish key schedule
*/
private void init_key() {
P = (int[])P_orig.clone();
S = (int[])S_orig.clone();
P = P_orig.clone();
S = S_orig.clone();
}

/**
@@ -605,7 +605,7 @@ private void ekskey(byte data[], byte key[]) {
*/
private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
int rounds, i, j;
int cdata[] = (int[])bf_crypt_ciphertext.clone();
int cdata[] = bf_crypt_ciphertext.clone();
int clen = cdata.length;
byte ret[];

Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public final class BreakException extends ControlFlowException {

private static final long serialVersionUID = -8260344464830705773L;

private final BreakID breakID;
private final Object result;

Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public final class ExitException extends ControlFlowException {

private static final long serialVersionUID = 8152389017577849952L;

private final int code;

public ExitException(int code) {
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public class JavaException extends RuntimeException {

private static final long serialVersionUID = -5710714298554437748L;

public JavaException(Throwable cause) {
super(doGetMessage(cause), cause);
}
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public final class NextException extends ControlFlowException {

private static final long serialVersionUID = 1354120079185876952L;

private final Object result;

public NextException(Object result) {
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@

public class RaiseException extends ControlFlowException {

private static final long serialVersionUID = -4128190563044417424L;

private final DynamicObject exception;

public RaiseException(DynamicObject exception) {
Original file line number Diff line number Diff line change
@@ -13,4 +13,6 @@

public final class RedoException extends ControlFlowException {

private static final long serialVersionUID = 7279456434679526564L;

}
Original file line number Diff line number Diff line change
@@ -13,4 +13,6 @@

public final class RetryException extends ControlFlowException {

private static final long serialVersionUID = -6020762812635743383L;

}
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public final class ReturnException extends ControlFlowException {

private static final long serialVersionUID = -45053969587014940L;

private final ReturnID returnID;
private final Object value;

Original file line number Diff line number Diff line change
@@ -13,4 +13,6 @@

public final class ThreadExitException extends ControlFlowException {

private static final long serialVersionUID = 4546683467567415385L;

}
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@

public class ThrowException extends ControlFlowException {

private static final long serialVersionUID = 5996793715653695919L;

private final Object tag;
private final Object value;

Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

public class TruffleFatalException extends RuntimeException {

private static final long serialVersionUID = 7605882675552845547L;

public TruffleFatalException(String message, Exception cause) {
super(message, cause);
}
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ public Map<String, Set<String>> getLocalTypes(RubyRootNode rootNode) {
final Map<String, Set<String>> rootNodeLocalTypes = localTypes.get(rootNode);

if (rootNodeLocalTypes == null) {
return Collections.EMPTY_MAP;
return Collections.<String, Set<String>>emptyMap();
} else {
return rootNodeLocalTypes;
}

0 comments on commit 15d956f

Please sign in to comment.