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

Commits on Feb 5, 2015

  1. [Truffle] Remove dangerous methods of SafepointManager. 

    * Otherwise calling size() becomes racy.
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    f6526cd View commit details

  2. [Truffle] Just add the current Thread to the runningThreads for NonRu… 

    …byThread.
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    ebbfa5a View commit details

  3. [Truffle] Remove unused method.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    127dffd View commit details

  4. [Truffle] Signal handlers thread now become Ruby threads. 

    * Otherwise we are bound to stop everyone else and execute arbitrary code for unlimited time.
  (and we would have to handle recursion in SafepointManager).
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    05a5eda View commit details

  5. [Truffle] Run Safepoint actions outside the global lock. 

    * If need serial order, they can just make their "accept" synchronized.
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    44609b5 View commit details

  6. [Truffle] No out of bounds in MRIBacktraceFormatter.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    cef9a1e View commit details

  7. [Truffle] Print the error on the stream.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    f243497 View commit details

  8. [Truffle] Finer-grained synchronization.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    b02a252 View commit details

  9. [Truffle] Do not try to translate a StackOverflowError into an "inter… 

    …nalError".

* Also one must be very careful as no subcall should be done at that point.
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    f5d7c5d View commit details

  10. [Truffle] Implement Comparable in Ruby. 

    * Avoid infinite recursion between Comparable#== and Kernel#<=>.
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    0f5a666 View commit details

  11. [Truffle] Last Comparable spec.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    c03c97b View commit details

  12. [Truffle] Reorganize Exception classes. 

    * Always inherit allocator from superclass if there is.
    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    4518b84 View commit details

  13. [Truffle] Have a few helpers to define core classes.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    b2fb3d3 View commit details

  14. [Truffle] Remove the Continuation class.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    ec795eb View commit details

  15. [Truffle] Fix allocator for defineClass(superclass, name).

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    41a06ba View commit details

  16. [Truffle] Overlooked Encoding::CompatibilityError.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    4d6bab4 View commit details

  17. [Truffle] Create only one instance of a BasicObjectAllocator.

    @eregon
    eregon committed Feb 5, 2015
    Copy the full SHA
    a4e929d View commit details
2 changes: 0 additions & 2 deletions spec/truffle/tags/core/comparable/equal_value_tags.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion spec/truffle/tags/core/comparable/gt_tags.txt
View file

This file was deleted.

2 changes: 0 additions & 2 deletions spec/truffle/tags/core/comparable/gte_tags.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion spec/truffle/tags/core/comparable/lt_tags.txt
View file

This file was deleted.

2 changes: 0 additions & 2 deletions spec/truffle/tags/core/comparable/lte_tags.txt
View file

This file was deleted.

6 changes: 0 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
View file
Original file line number Diff line number Diff line change
@@ -21,21 +21,16 @@
import org.jruby.truffle.nodes.TopLevelRaiseHandler;
import org.jruby.truffle.nodes.control.SequenceNode;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.nodes.methods.SetMethodDeclarationContext;
import org.jruby.truffle.nodes.rubinius.ByteArrayNodesFactory;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyClass;
import org.jruby.truffle.runtime.rubinius.RubiniusByteArray;
import org.jruby.truffle.runtime.util.FileUtils;
import org.jruby.truffle.translator.NodeWrapper;
import org.jruby.truffle.translator.TranslatorDriver;
import org.jruby.util.cli.Options;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;

@@ -68,7 +63,6 @@ public void init() {
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, BindingNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, BignumNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ClassNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ComparableNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, DirNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ExceptionNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, FalseClassNodesFactory.getFactories());
172 changes: 0 additions & 172 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ComparableNodes.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/methods/ExceptionTranslatingNode.java
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ public ExceptionTranslatingNode(RubyContext context, SourceSection sourceSection
public Object execute(VirtualFrame frame) {
try {
return child.execute(frame);
} catch (TruffleFatalException | ThreadExitException exception) {
} catch (StackOverflowError | TruffleFatalException | ThreadExitException exception) {
throw exception;
} catch (ControlFlowException exception) {
controlProfile.enter();
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/backtrace/MRIBacktraceFormatter.java
View file
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ public static String formatCallerLine(List<Activation> activations, int n) {
}

private static SourceSection nextUserSourceSection(List<Activation> activations, int n) {
while (true) {
while (n < activations.size()) {
SourceSection sourceSection = activations.get(n).getCallNode().getEncapsulatingSourceSection();

if (!(sourceSection instanceof CoreSourceSection)) {
@@ -129,6 +129,7 @@ private static SourceSection nextUserSourceSection(List<Activation> activations,

n++;
}
return null;
}

}
Loading