Skip to content

Commit

Permalink
[Truffle] Fix merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisseaton committed Dec 12, 2014
1 parent 78db904 commit 4cc6aff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3079,7 +3079,7 @@ public Object selectObject(VirtualFrame frame, RubyArray array, RubyProc block)
}
} finally {
if (CompilerDirectives.inInterpreter()) {
((RubyRootNode) getRootNode()).reportLoopCountThroughBlocks(count);
((RubyRootNode) getRootNode()).reportLoopCount(count);
}
}

Expand Down Expand Up @@ -3112,7 +3112,7 @@ public Object selectFixnumInteger(VirtualFrame frame, RubyArray array, RubyProc
}
} finally {
if (CompilerDirectives.inInterpreter()) {
((RubyRootNode) getRootNode()).reportLoopCountThroughBlocks(count);
((RubyRootNode) getRootNode()).reportLoopCount(count);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.RubyValueProfile;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.UndefinedPlaceholder;
Expand Down

0 comments on commit 4cc6aff

Please sign in to comment.