Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 428334669c17
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d475dc7024d
Choose a head ref
  • 6 commits
  • 52 files changed
  • 1 contributor

Commits on Aug 20, 2015

  1. [Truffle] Remove the spare exception handlers.

    @chrisseaton
    chrisseaton committed Aug 20, 2015
    Copy the full SHA
    946cef5 View commit details

  2. [Truffle] Remove backtrace formatter abstraction.

    @chrisseaton
    chrisseaton committed Aug 20, 2015
    Copy the full SHA
    635b2a4 View commit details

  3. [Truffle] Remove DebugOperations.

    @chrisseaton
    chrisseaton committed Aug 20, 2015
    Copy the full SHA
    1a67414 View commit details

  4. [Truffle] Simplify BacktraceFormatter.

    @chrisseaton
    chrisseaton committed Aug 20, 2015
    Copy the full SHA
    6e8a9e0 View commit details

  5. [Truffle] Parameterise the backtrace formatter.

    @chrisseaton
    chrisseaton committed Aug 20, 2015
    Copy the full SHA
    a30a5d4 View commit details

Commits on Aug 21, 2015

  1. [Truffle] Be more aggressive about hiding the core library in backtra… 

    …ces and add option to disable.
    @chrisseaton
    chrisseaton committed Aug 21, 2015
    Copy the full SHA
    3d475dc View commit details
Showing with 340 additions and 729 deletions.
  1. +2 −7 core/src/main/java/org/jruby/util/cli/Options.java
  2. +0 −3 truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java
  3. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/control/TraceNode.java
  4. +1 −5 truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
  5. +10 −16 truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
  6. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/FiberNodes.java
  7. +4 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  8. +12 −19 truffle/src/main/java/org/jruby/truffle/nodes/core/ProcNodes.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
  10. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java
  11. +2 −3 truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java
  12. +2 −4 truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TopLevelRaiseHandler.java
  13. +3 −1 truffle/src/main/java/org/jruby/truffle/nodes/ext/DigestNodes.java
  14. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/globals/ReadMatchReferenceNode.java
  15. +0 −6 truffle/src/main/java/org/jruby/truffle/nodes/methods/ExceptionTranslatingNode.java
  16. +4 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ByteArrayNodes.java
  17. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/DirPrimitiveNodes.java
  18. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOBufferPrimitiveNodes.java
  19. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
  20. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PointerNodes.java
  21. +4 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java
  22. +3 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
  23. +3 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
  24. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/TimePrimitiveNodes.java
  25. +4 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java
  26. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/yield/CachedYieldDispatchNode.java
  27. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/yield/GeneralYieldDispatchNode.java
  28. +4 −1 truffle/src/main/java/org/jruby/truffle/nodes/yield/YieldDispatchHeadNode.java
  29. +0 −1 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/OMProcessor.java
  30. +4 −1 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutParser.java
  31. +0 −168 truffle/src/main/java/org/jruby/truffle/runtime/DebugOperations.java
  32. +18 −24 truffle/src/main/java/org/jruby/truffle/runtime/RubyCallStack.java
  33. +20 −5 truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  34. +6 −4 truffle/src/main/java/org/jruby/truffle/runtime/RubyObjectType.java
  35. +0 −21 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/Backtrace.java
  36. +175 −2 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/BacktraceFormatter.java
  37. +0 −118 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/DebugBacktraceFormatter.java
  38. +0 −91 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/ImplementationDebugBacktraceFormatter.java
  39. +0 −152 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/MRIBacktraceFormatter.java
  40. +8 −9 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  41. +19 −5 truffle/src/main/java/org/jruby/truffle/runtime/core/ModuleFields.java
  42. +4 −2 truffle/src/main/java/org/jruby/truffle/runtime/hash/BucketsStrategy.java
  43. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/layouts/ClassLayout.java
  44. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/layouts/ThreadLayout.java
  45. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/object/ObjectGraph.java
  46. +2 −5 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/AtExitManager.java
  47. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
  48. +3 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/InstrumentationServerManager.java
  49. +5 −11 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ObjectSpaceManager.java
  50. +13 −8 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SimpleShell.java
  51. +2 −5 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java
  52. +2 −2 truffle/src/main/ruby/core/rubinius/common/kernel.rb
9 changes: 2 additions & 7 deletions core/src/main/java/org/jruby/util/cli/Options.java
View file
Original file line number Diff line number Diff line change
@@ -134,11 +134,12 @@ public class Options {
public static final Option<String> TRUFFLE_TRANSLATOR_PRINT_AST = string(TRUFFLE, "truffle.translator.print_asts", "", "Comma delimited list of method names to print the AST of after translation.");
public static final Option<String> TRUFFLE_TRANSLATOR_PRINT_FULL_AST = string(TRUFFLE, "truffle.translator.print_full_asts", "", "Comma delimited list of method names to print the full AST of after translation.");
public static final Option<String> TRUFFLE_TRANSLATOR_PRINT_PARSE_TREE = string(TRUFFLE, "truffle.translator.print_parse_trees", "", "Comma delimited list of method names to print the JRuby parse tree of before translation.");
public static final Option<Boolean> TRUFFLE_PANIC_ON_JAVA_ASSERT = bool(TRUFFLE, "truffle.debug.panic_on_java_assert", false, "Panic as soon as a Java assertion failure is found.");
public static final Option<Boolean> TRUFFLE_EXCEPTIONS_PRINT_JAVA = bool(TRUFFLE, "truffle.exceptions.print_java", false, "Print Java exceptions at the point of translating them to Ruby exceptions.");
public static final Option<Boolean> TRUFFLE_EXCEPTIONS_PRINT_UNCAUGHT_JAVA = bool(TRUFFLE, "truffle.exceptions.print_uncaught_java", false, "Print uncaught Java exceptions at the point of translating them to Ruby exceptions.");
public static final Option<Boolean> TRUFFLE_COVERAGE = bool(TRUFFLE, "truffle.coverage", false, "Enable coverage (will be enabled by default in the future - currently has some bugs");

public static final Option<Boolean> TRUFFLE_BACKTRACES_HIDE_CORE_FILES = bool(TRUFFLE, "truffle.backtraces.hide_core_files", true, "Hide core source files in backtraces, like MRI does.");

public static final Option<Boolean> TRUFFLE_INLINER_ALWAYS_CLONE_YIELD = bool(TRUFFLE, "truffle.inliner.always_clone_yield", true, "Always clone yield call targets.");
public static final Option<Boolean> TRUFFLE_INLINER_ALWAYS_INLINE_YIELD = bool(TRUFFLE, "truffle.inliner.always_inline_yield", true, "Always inline yield call targets.");
public static final Option<Boolean> TRUFFLE_DISPATCH_METAPROGRAMMING_ALWAYS_UNCACHED = bool(TRUFFLE, "truffle.dispatch.metaprogramming_always_uncached", false, "Always use uncached dispatch for the metaprogramming methods #__send__, #send and #respond_to?, and for any call site that has to use #method_missing or #const_missing.");
@@ -149,12 +150,6 @@ public class Options {
public static final Option<Boolean> TRUFFLE_RANDOMIZE_STORAGE_ARRAY = bool(TRUFFLE, "truffle.randomize_storage.array", false, "Randomize Array storage strategy.");
public static final Option<Integer> TRUFFLE_RANDOMIZE_SEED = integer(TRUFFLE, "truffle.randomize.seed", 0, "Seed for any randomization.");

public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_DISPLAY_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.display_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.MRI, "How to format backtraces displayed to the user.");
public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_DEBUG_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.debug_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.DEBUG, "How to format backtraces displayed using TruffleDebug.dump_call_stack.");
public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_EXCEPTION_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.exception_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.MRI, "How to format backtraces in Exception objects.");
public static final Option<Integer> TRUFFLE_BACKTRACE_MAX_VALUE_LENGTH = integer(TRUFFLE, "truffle.backtrace.max_value_length", 20, "Max length for values when displayed in a backtrace.");
public static final Option<Boolean> TRUFFLE_BACKTRACE_GENERATE = bool(TRUFFLE, "truffle.backtrace.generate", true, "Generate backtraces on exceptions.");

public static final Option<Boolean> NATIVE_ENABLED = bool(NATIVE, "native.enabled", true, "Enable/disable native code, including POSIX features and C exts.");
public static final Option<Boolean> NATIVE_VERBOSE = bool(NATIVE, "native.verbose", false, "Enable verbose logging of native extension loading.");
public static final Option<Boolean> FFI_COMPILE_DUMP = bool(NATIVE, "ffi.compile.dump", false, "Dump bytecode-generated FFI stubs to console.");
3 changes: 0 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java
View file
Original file line number Diff line number Diff line change
@@ -14,9 +14,6 @@
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.ThreadLocalObject;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.layouts.ThreadLayoutImpl;
import org.jruby.truffle.runtime.layouts.TimeLayoutImpl;
import org.jruby.truffle.runtime.layouts.rubinius.ByteArrayLayoutImpl;

public abstract class RubyGuards {

2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/control/TraceNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,10 +17,8 @@
import com.oracle.truffle.api.nodes.InvalidAssumptionException;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.BindingNodes;
import org.jruby.truffle.nodes.core.ProcNodes;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.Layouts;
6 changes: 1 addition & 5 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeUtil;
import com.oracle.truffle.api.object.*;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.nodes.RubyGuards;
@@ -31,10 +31,6 @@
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;

import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

@CoreClass(name = "BasicObject")
public abstract class BasicObjectNodes {

26 changes: 10 additions & 16 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
View file
Original file line number Diff line number Diff line change
@@ -19,36 +19,30 @@
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyCallStack;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.backtrace.Activation;
import org.jruby.truffle.runtime.backtrace.Backtrace;
import org.jruby.truffle.runtime.backtrace.MRIBacktraceFormatter;
import org.jruby.truffle.runtime.backtrace.BacktraceFormatter;
import org.jruby.truffle.runtime.layouts.Layouts;

import java.util.EnumSet;
import java.util.List;

@CoreClass(name = "Exception")
public abstract class ExceptionNodes {

public static class BacktraceFormatter extends MRIBacktraceFormatter {
@Override
protected String formatFromLine(List<Activation> activations, int n) {
return formatCallerLine(activations, n);
}
}

public static final BacktraceFormatter BACKTRACE_FORMATTER = new BacktraceFormatter();

@TruffleBoundary
public static DynamicObject asRubyStringArray(DynamicObject exception) {
assert RubyGuards.isRubyException(exception);

assert Layouts.EXCEPTION.getBacktrace(exception) != null;
final String[] lines = BACKTRACE_FORMATTER.format(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(exception)).getContext(), exception, Layouts.EXCEPTION.getBacktrace(exception));

final Object[] array = new Object[lines.length];
final RubyContext context = Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(exception)).getContext();

final List<String> lines = new BacktraceFormatter(context, EnumSet.of(BacktraceFormatter.FormattingFlags.OMIT_FROM_PREFIX))
.formatBacktrace(exception, Layouts.EXCEPTION.getBacktrace(exception));

final Object[] array = new Object[lines.size()];

for (int n = 0;n < lines.length; n++) {
array[n] = StringNodes.createString(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(exception)).getContext().getCoreLibrary().getStringClass(), lines[n]);
for (int n = 0;n < lines.size(); n++) {
array[n] = StringNodes.createString(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(exception)).getContext().getCoreLibrary().getStringClass(), lines.get(n));
}

return ArrayNodes.fromObjects(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(exception)).getContext().getCoreLibrary().getArrayClass(), array);
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/FiberNodes.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import com.oracle.truffle.api.nodes.ControlFlowException;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.SingleValueCastNode;
6 changes: 4 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;

import org.jcodings.Encoding;
import org.jcodings.specific.USASCIIEncoding;
import org.jcodings.specific.UTF8Encoding;
@@ -77,7 +76,10 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@CoreClass(name = "Kernel")
public abstract class KernelNodes {
31 changes: 12 additions & 19 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ProcNodes.java
View file
Original file line number Diff line number Diff line change
@@ -9,16 +9,25 @@
*/
package org.jruby.truffle.nodes.core;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.Frame;
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.source.NullSourceSection;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.ast.ArgsNode;
import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.runtime.Helpers;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.array.ArrayNodes;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.objects.AllocateObjectNode;
import org.jruby.truffle.nodes.objects.AllocateObjectNodeGen;
import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyArguments;
@@ -29,22 +38,6 @@
import org.jruby.truffle.runtime.methods.InternalMethod;
import org.jruby.truffle.runtime.methods.SharedMethodInfo;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.NodeChildren;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.Frame;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
import com.oracle.truffle.api.nodes.Node.Child;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.source.NullSourceSection;
import com.oracle.truffle.api.source.SourceSection;

@CoreClass(name = "Proc")
public abstract class ProcNodes {

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.jruby.truffle.nodes.core.array.ArrayBuilderNode;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.*;
import org.jruby.truffle.runtime.layouts.Layouts;

@CoreClass(name = "Range")
public abstract class RangeNodes {
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.layouts.TimeLayoutImpl;

@CoreClass(name = "Time")
public abstract class TimeNodes {
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,6 @@
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;
import org.jruby.truffle.runtime.DebugOperations;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
@@ -51,7 +50,7 @@
public abstract class HashNodes {

public static int slowHashKey(RubyContext context, Object key) {
final Object hashValue = DebugOperations.send(context, key, "hash", null);
final Object hashValue = context.send(key, "hash", null);

if (hashValue instanceof Integer) {
return (int) hashValue;
@@ -71,7 +70,7 @@ public static boolean slowAreKeysEqual(RubyContext context, Object a, Object b,
method = "eql?";
}

final Object equalityResult = DebugOperations.send(context, a, method, null, b);
final Object equalityResult = context.send(a, method, null, b);

if (equalityResult instanceof Boolean) {
return (boolean) equalityResult;
6 changes: 2 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TopLevelRaiseHandler.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.backtrace.Backtrace;
import org.jruby.truffle.runtime.backtrace.BacktraceFormatter;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.control.ThreadExitException;
import org.jruby.truffle.runtime.layouts.Layouts;
@@ -46,9 +46,7 @@ public Object execute(VirtualFrame frame) {
private void handleException(RaiseException e) {
final Object rubyException = e.getRubyException();

for (String line : Backtrace.DISPLAY_FORMATTER.format(getContext(), (DynamicObject) rubyException, Layouts.EXCEPTION.getBacktrace((DynamicObject) rubyException))) {
System.err.println(line);
}
BacktraceFormatter.createDefaultFormatter(getContext()).printBacktrace((DynamicObject) rubyException, Layouts.EXCEPTION.getBacktrace((DynamicObject) rubyException));

System.exit(1);
}
4 changes: 3 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/ext/DigestNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,9 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.ext.digest.BubbleBabble;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.nodes.core.CoreClass;
import org.jruby.truffle.nodes.core.CoreMethod;
import org.jruby.truffle.nodes.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.layouts.ext.DigestLayoutImpl;
1 change: 0 additions & 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
@@ -13,7 +13,6 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.Layouts;
6 changes: 0 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/nodes/methods/ExceptionTranslatingNode.java
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
import org.jruby.exceptions.MainExitException;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.DebugOperations;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
@@ -35,7 +34,6 @@ public class ExceptionTranslatingNode extends RubyNode {

private static final boolean PRINT_JAVA_EXCEPTIONS = Options.TRUFFLE_EXCEPTIONS_PRINT_JAVA.load();
private static final boolean PRINT_UNCAUGHT_JAVA_EXCEPTIONS = Options.TRUFFLE_EXCEPTIONS_PRINT_UNCAUGHT_JAVA.load();
private static final boolean PANIC_ON_JAVA_ASSERT = Options.TRUFFLE_PANIC_ON_JAVA_ASSERT.load();

private final UnsupportedOperationBehavior unsupportedOperationBehavior;

@@ -172,10 +170,6 @@ public DynamicObject translate(Throwable throwable) {
throwable.printStackTrace();
}

if (PANIC_ON_JAVA_ASSERT && throwable instanceof AssertionError) {
DebugOperations.panic(getContext(), this, throwable.toString());
}

if (throwable.getStackTrace().length > 0) {
return getContext().getCoreLibrary().internalError(String.format("%s %s %s", throwable.getClass().getSimpleName(), throwable.getMessage(), throwable.getStackTrace()[0].toString()), this);
} else {
6 changes: 4 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ByteArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,13 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.nodes.core.CoreClass;
import org.jruby.truffle.nodes.core.CoreMethod;
import org.jruby.truffle.nodes.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.nodes.core.StringNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.layouts.rubinius.ByteArrayLayoutImpl;
import org.jruby.util.ByteList;

@CoreClass(name = "Rubinius::ByteArray")
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/DirPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,6 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import jnr.constants.platform.Errno;
import org.jruby.truffle.nodes.core.ClassNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOBufferPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -44,9 +44,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import jnr.constants.platform.Errno;
import org.jruby.truffle.nodes.core.ClassNodes;
import org.jruby.truffle.nodes.core.ExceptionNodes;
import org.jruby.truffle.nodes.core.StringNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,6 @@
import jnr.constants.platform.Fcntl;
import jnr.ffi.Pointer;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.core.ClassNodes;
import org.jruby.truffle.nodes.core.StringNodes;
import org.jruby.truffle.nodes.core.array.ArrayNodes;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PointerNodes.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@

import com.oracle.truffle.api.object.DynamicObject;
import jnr.ffi.Pointer;
import org.jruby.truffle.nodes.core.ClassNodes;
import org.jruby.truffle.runtime.layouts.Layouts;

public abstract class PointerNodes {
5 changes: 4 additions & 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
@@ -18,7 +18,10 @@
import jnr.ffi.Pointer;
import org.jruby.RubyEncoding;
import org.jruby.platform.Platform;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.nodes.core.CoreClass;
import org.jruby.truffle.nodes.core.CoreMethod;
import org.jruby.truffle.nodes.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.nodes.core.StringNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
4 changes: 3 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@
import org.jcodings.Encoding;
import org.joni.Matcher;
import org.joni.Regex;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.nodes.core.RegexpGuards;
import org.jruby.truffle.nodes.core.RegexpNodes;
import org.jruby.truffle.nodes.core.StringNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
Loading