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

Commits on Nov 8, 2016

  1. Copy the full SHA
    e3a43ed View commit details
  2. [Truffle] Disable call graph tools on AOT since they rely on runtime …

    …reflection, which isn't available.
    nirvdrum committed Nov 8, 2016
    Copy the full SHA
    78ac114 View commit details
Showing with 8 additions and 2 deletions.
  1. +3 −1 truffle/src/main/java/org/jruby/truffle/Main.java
  2. +5 −1 truffle/src/main/java/org/jruby/truffle/tools/callgraph/CallGraph.java
4 changes: 3 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/Main.java
Original file line number Diff line number Diff line change
@@ -44,6 +44,7 @@
*/
package org.jruby.truffle;

import com.oracle.truffle.api.TruffleOptions;
import org.jruby.RubyInstanceConfig;
import org.jruby.util.cli.Options;
import org.jruby.util.cli.OutputStrings;
@@ -166,7 +167,8 @@ public static void printTruffleTimeMetric(String id) {
}

private static void printTruffleMemoryMetric() {
if (Options.TRUFFLE_METRICS_MEMORY_USED_ON_EXIT.load()) {
// Memory stats aren't available on AOT.
if (!TruffleOptions.AOT && Options.TRUFFLE_METRICS_MEMORY_USED_ON_EXIT.load()) {
for (int n = 0; n < 10; n++) {
System.gc();
}
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
*/
package org.jruby.truffle.tools.callgraph;

import com.oracle.truffle.api.TruffleOptions;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.language.methods.SharedMethodInfo;

@@ -80,6 +81,9 @@ public Map<String, Set<String>> getLocalTypes(RubyRootNode rootNode) {
}

public void resolve() {
rootNodeToMethodVersion.values().forEach(MethodVersion::resolve);
// Call graph currently doesn't work with AOT due to runtime reflection.
if (!TruffleOptions.AOT) {
rootNodeToMethodVersion.values().forEach(MethodVersion::resolve);
}
}
}