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

Commits on Jun 29, 2016

  1. [Truffle] Remove useless branching based on configuration.

    @eregon
    eregon committed Jun 29, 2016
    Copy the full SHA
    49ff321 View commit details

  2. [Truffle] defined() is sufficient to check existence of config values.

    @eregon
    eregon committed Jun 29, 2016
    Copy the full SHA
    3ddc21c View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −4 truffle/src/main/java/org/jruby/truffle/platform/DefaultRubiniusConfiguration.java
  2. +0 −2 truffle/src/main/ruby/core/hash.rb
6 changes: 2 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/platform/DefaultRubiniusConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -57,8 +57,6 @@ public abstract class DefaultRubiniusConfiguration {
public static final int SIZE_OF_POINTER = 8;

public static void load(RubiniusConfiguration configuration, RubyContext context) {
configuration.config("hash.hamt", false);

configuration.config("rbx.platform.file.S_IRUSR", FileStat.S_IRUSR);
configuration.config("rbx.platform.file.S_IWUSR", FileStat.S_IWUSR);
configuration.config("rbx.platform.file.S_IXUSR", FileStat.S_IXUSR);
@@ -81,15 +79,15 @@ public static void load(RubiniusConfiguration configuration, RubyContext context
configuration.config("rbx.platform.file.S_ISVTX", FileStat.S_ISVTX);

for (Fcntl fcntl : Fcntl.values()) {
if (fcntl.defined() && fcntl.name().startsWith("F_")) {
if (fcntl.defined()) {
configuration.config("rbx.platform.fcntl." + fcntl.name(), fcntl.intValue());
}
}

configuration.config("rbx.platform.fcntl.FD_CLOEXEC", 1); // TODO BJF 15-May-2015 Get from JNR constants or stdlib FFI

for (OpenFlags openFlag : OpenFlags.values()) {
if (openFlag.defined() && openFlag.name().startsWith("O_")) {
if (openFlag.defined()) {
configuration.config("rbx.platform.file." + openFlag.name(), openFlag.intValue());
}
}
2 changes: 0 additions & 2 deletions truffle/src/main/ruby/core/hash.rb
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

unless Rubinius::Config['hash.hamt']
class Hash
include Enumerable

@@ -522,4 +521,3 @@ def reject(&block)
end

end
end