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

Commits on May 23, 2016

  1. Copy the full SHA
    4966543 View commit details
  2. Copy the full SHA
    c613c17 View commit details
  3. Copy the full SHA
    ad4d9d8 View commit details
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/Layouts.java
Original file line number Diff line number Diff line change
@@ -66,8 +66,7 @@
import org.jruby.truffle.core.rubinius.IOBufferLayoutImpl;
import org.jruby.truffle.core.rubinius.IOLayout;
import org.jruby.truffle.core.rubinius.IOLayoutImpl;
import org.jruby.truffle.core.rubinius.PointerLayout;
import org.jruby.truffle.core.rubinius.PointerLayoutImpl;
import org.jruby.truffle.extra.ffi.PointerLayout;
import org.jruby.truffle.core.rubinius.RandomizerLayout;
import org.jruby.truffle.core.rubinius.RandomizerLayoutImpl;
import org.jruby.truffle.core.rubinius.StatLayout;
@@ -84,6 +83,7 @@
import org.jruby.truffle.core.time.TimeLayoutImpl;
import org.jruby.truffle.core.tracepoint.TracePointLayout;
import org.jruby.truffle.core.tracepoint.TracePointLayoutImpl;
import org.jruby.truffle.extra.ffi.PointerLayoutImpl;
import org.jruby.truffle.stdlib.bigdecimal.BigDecimalLayout;
import org.jruby.truffle.stdlib.bigdecimal.BigDecimalLayoutImpl;
import org.jruby.truffle.stdlib.digest.DigestLayout;
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
import org.jruby.truffle.core.rubinius.IOBufferPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.IOPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.NativeFunctionPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.PointerPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.RandomizerPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.RegexpPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.StatPrimitiveNodesFactory;
@@ -37,6 +36,7 @@
import org.jruby.truffle.core.symbol.SymbolNodesFactory;
import org.jruby.truffle.core.thread.ThreadNodesFactory;
import org.jruby.truffle.core.time.TimeNodesFactory;
import org.jruby.truffle.extra.ffi.PointerPrimitiveNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;

10 changes: 3 additions & 7 deletions truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java
Original file line number Diff line number Diff line change
@@ -158,19 +158,15 @@ public Rope getRope(byte[] bytes, Encoding encoding, CodeRange codeRange) {
}

public boolean contains(Rope rope) {
final Key key = new Key(rope.getBytes(), rope.getEncoding());

lock.readLock().lock();

try {
for (Map.Entry<Key, WeakReference<Rope>> entry : ropesTable.entrySet()) {
if (entry.getValue().get() == rope) {
return true;
}
}
return ropesTable.get(key) != null;
} finally {
lock.readLock().unlock();
}

return false;
}

public int getByteArrayReusedCount() {
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.thread.ThreadManager;
import org.jruby.truffle.core.thread.ThreadManager.ResultWithinTime;
import org.jruby.truffle.extra.ffi.PointerPrimitiveNodes;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
import org.jruby.truffle.core.rope.CodeRange;
import org.jruby.truffle.core.rope.RopeNodes;
import org.jruby.truffle.core.rope.RopeNodesFactory;
import org.jruby.truffle.core.rubinius.PointerPrimitiveNodes;
import org.jruby.truffle.extra.ffi.PointerPrimitiveNodes;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.SnippetNode;
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.extra.ffi;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.extra.ffi;

import com.kenai.jffi.MemoryIO;
import com.oracle.truffle.api.CompilerDirectives;
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.Layouts;
import org.jruby.truffle.core.rubinius.PointerPrimitiveNodes;
import org.jruby.truffle.extra.ffi.PointerPrimitiveNodes;
import org.jruby.truffle.language.threadlocal.ThreadLocalObject;

public abstract class RubyGuards {
8 changes: 4 additions & 4 deletions truffle/src/main/ruby/core.rb
Original file line number Diff line number Diff line change
@@ -28,10 +28,10 @@
Truffle::Boot.require_core 'core/type'
Truffle::Boot.require_core 'core/weakref'
Truffle::Boot.require_core 'core/library'
Truffle::Boot.require_core 'core/ffi'
Truffle::Boot.require_core 'core/pointer'
Truffle::Boot.require_core 'core/ffi_file'
Truffle::Boot.require_core 'core/ffi_struct'
Truffle::Boot.require_core 'core/truffle/ffi/ffi'
Truffle::Boot.require_core 'core/truffle/ffi/pointer'
Truffle::Boot.require_core 'core/truffle/ffi/ffi_file'
Truffle::Boot.require_core 'core/truffle/ffi/ffi_struct'
Truffle::Boot.require_core 'core/io'
Truffle::Boot.require_core 'core/immediate'
Truffle::Boot.require_core 'core/string_mirror'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.