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: 4110f1f9200b
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 29ca7db92b06
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 19, 2015

  1. [Truffle] Remove old require debug code.

    @chrisseaton
    chrisseaton committed Aug 19, 2015
    Copy the full SHA
    c8b55cf View commit details

  2. Merge branch 'master' of github.com:jruby/jruby

    @chrisseaton
    chrisseaton committed Aug 19, 2015
    Copy the full SHA
    29ca7db View commit details
Showing with 0 additions and 16 deletions.
  1. +0 −2 core/src/main/java/org/jruby/util/cli/Options.java
  2. +0 −14 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
2 changes: 0 additions & 2 deletions core/src/main/java/org/jruby/util/cli/Options.java
View file
Original file line number Diff line number Diff line change
@@ -149,8 +149,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<Boolean> TRUFFLE_REQUIRE_SHOW_RESOLUTION = bool(TRUFFLE, "truffle.require.show_resolution", false, "So what files require statements resolve to.");

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.");
14 changes: 0 additions & 14 deletions truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
View file
Original file line number Diff line number Diff line change
@@ -34,8 +34,6 @@
*/
public class FeatureManager {

private static final boolean SHOW_RESOLUTION = Options.TRUFFLE_REQUIRE_SHOW_RESOLUTION.load();

private final RubyContext context;

private Source mainScriptSource = null;
@@ -130,10 +128,6 @@ private boolean requireFile(String feature, String path, Node currentNode) throw
return false;
}

if (SHOW_RESOLUTION) {
System.err.printf("resolved %s -> %s%n", feature, coreFileName);
}

ArrayNodes.slowPush(loadedFeatures, StringNodes.createString(context.getCoreLibrary().getStringClass(), path));
context.getCoreLibrary().loadRubyCore(coreFileName, "uri:classloader:/");

@@ -152,10 +146,6 @@ else if (path.startsWith("core:/")) {
return false;
}

if (SHOW_RESOLUTION) {
System.err.printf("resolved %s -> %s%n", feature, coreFileName);
}

ArrayNodes.slowPush(loadedFeatures, StringNodes.createString(context.getCoreLibrary().getStringClass(), path));
context.getCoreLibrary().loadRubyCore(coreFileName, "core:/");

@@ -177,10 +167,6 @@ else if (path.startsWith("core:/")) {
}
}

if (SHOW_RESOLUTION) {
System.err.printf("resolved %s -> %s%n", feature, expandedPath);
}

// TODO (nirvdrum 15-Jan-15): If we fail to load, we should remove the path from the loaded features because subsequent requires of the same statement may succeed.
final DynamicObject pathString = StringNodes.createString(context.getCoreLibrary().getStringClass(), expandedPath);
ArrayNodes.slowPush(loadedFeatures, pathString);