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: 424467a3560a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2bd8354dff5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 11, 2016

  1. Remove duplicated line.

    Sarah Mount committed Jul 11, 2016
    Copy the full SHA
    c676446 View commit details

Commits on Jul 26, 2016

  1. Merge pull request #4007 from snim2/snim2-fix-callgraph2html-typo

    Remove duplicated line.
    eregon authored Jul 26, 2016
    Copy the full SHA
    b2bd835 View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 tool/truffle/callgraph2html.rb
7 changes: 3 additions & 4 deletions tool/truffle/callgraph2html.rb
Original file line number Diff line number Diff line change
@@ -136,7 +136,6 @@ def reachable
method_version = objects[Integer(line[1])]
eval_code = line.drop(2).join(' ')
method_version.eval_code.push eval_code
when 'local'
when 'callsite'
method = objects[Integer(line[1])]
callsite = CG::CallSite.new(line[2], method, line[3])
@@ -245,15 +244,15 @@ def annotate(method_version, offset)
<% if reachable_objects.include?(method_version) %>
<div id='method-version-<%= method_version.id %>' class='method-version'>
<% unless method_version.called_from.empty? %>
<p>Called from:</p>
<p>Called from:</p>
<ul>
<% method_version.called_from.each do |caller| %>
<li><a href='#method-version-<%= caller.method_version.id %>'><%= h(caller.method_version.method.name) %></a></li>
<% end %>
</ul>
<% end %>
<% unless method_version.locals.empty? %>
<p>Locals:</p>
<p>Locals:</p>
<ul>
<% method_version.locals.each do |name, types| %>
<li><code><%= h(name) %></li>
@@ -266,7 +265,7 @@ def annotate(method_version, offset)
</ul>
<% end %>
<% unless method_version.eval_code.empty? %>
<p>Evals:</p>
<p>Evals:</p>
<ul>
<% method_version.eval_code.each do |eval_code| %>
<li><code><%= h(eval_code) %></code></li>