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

Commits on Oct 5, 2015

  1. Copy the full SHA
    a534785 View commit details
  2. Copy the full SHA
    137e3d3 View commit details
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.methods.ExceptionTranslatingNode;
import org.jruby.truffle.runtime.RubyContext;
@@ -35,7 +34,6 @@ public class TryNode extends RubyNode {
@Child private ClearExceptionVariableNode clearExceptionVariableNode;

private final BranchProfile elseProfile = BranchProfile.create();
private final boolean elsePresentProfile;
private final BranchProfile controlFlowProfile = BranchProfile.create();
private final BranchProfile raiseExceptionProfile = BranchProfile.create();

@@ -44,7 +42,6 @@ public TryNode(RubyContext context, SourceSection sourceSection, ExceptionTransl
this.tryPart = tryPart;
this.rescueParts = rescueParts;
this.elsePart = elsePart;
elsePresentProfile = elsePart != null;
clearExceptionVariableNode = new ClearExceptionVariableNode(context, sourceSection);
}

@@ -74,7 +71,7 @@ public Object execute(VirtualFrame frame) {

elseProfile.enter();

if (elsePresentProfile) {
if (elsePart != null) {
result = elsePart.execute(frame);
}
return result;
Original file line number Diff line number Diff line change
@@ -42,8 +42,7 @@ public MethodDefinitionNode(RubyContext context, SourceSection sourceSection, St
public InternalMethod executeMethod(VirtualFrame frame) {
final DynamicObject dummyModule = getContext().getCoreLibrary().getObjectClass();
final Visibility dummyVisibility = Visibility.PUBLIC;
return new InternalMethod(sharedMethodInfo, name, dummyModule, dummyVisibility, false, callTarget,
frame.materialize() /* Currently used for visibility, will be fixed when we keep visibility in some better place */);
return new InternalMethod(sharedMethodInfo, name, dummyModule, dummyVisibility, false, callTarget, null);
}

@Override