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

Commits on Sep 18, 2015

  1. [Truffle] Oragnize imports.

    @eregon
    eregon committed Sep 18, 2015
    Copy the full SHA
    8a8385a View commit details

  2. [Truffle] Fix some type safety warnings.

    @eregon
    eregon committed Sep 18, 2015
    Copy the full SHA
    5d79e12 View commit details
3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;

import org.jcodings.specific.USASCIIEncoding;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.RubyString;
@@ -2281,6 +2282,7 @@ public MaxBlockNode(RubyContext context, SourceSection sourceSection) {

@Specialization
public DynamicObject max(VirtualFrame frame, Object maximumObject, Object value) {
@SuppressWarnings("unchecked")
final Memo<Object> maximum = (Memo<Object>) maximumObject;

// TODO(CS): cast
@@ -2385,6 +2387,7 @@ public MinBlockNode(RubyContext context, SourceSection sourceSection) {

@Specialization
public DynamicObject min(VirtualFrame frame, Object minimumObject, Object value) {
@SuppressWarnings("unchecked")
final Memo<Object> minimum = (Memo<Object>) minimumObject;

// TODO(CS): cast
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/cext/CExtManager.java
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ public class CExtManager {
public static synchronized CExtSubsystem getSubsystem() {
if (!loaded) {
try {
@SuppressWarnings("unchecked")
final Class<? extends CExtSubsystem> clazz = (Class<? extends CExtSubsystem>)
Class.forName("com.oracle.truffle.jruby.interop.cext.CExtSubsystemImpl");
subsystem = clazz.newInstance();
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/loader/SourceLoader.java
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ private Source loadResource(String path) throws IOException {
throw new FileNotFoundException(path);
}

final Class relativeClass;
final Class<?> relativeClass;
final String relativePath;

if (path.startsWith(TRUFFLE_SCHEME)) {
8 changes: 3 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,12 @@
*/
package org.jruby.truffle.runtime.methods;

import com.oracle.truffle.api.source.SourceSection;
import org.jruby.ast.ArgsNode;
import org.jruby.ast.Node;
import java.util.Arrays;

import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.runtime.Helpers;
import org.jruby.truffle.runtime.LexicalScope;

import java.util.Arrays;
import com.oracle.truffle.api.source.SourceSection;

/**
* {@link InternalMethod} objects are copied as properties such as visibility are changed. {@link SharedMethodInfo} stores