Merge branch 'master' into truffle-head

jruby · Mar 7, 2016 · c7df53e · c7df53e
2 parents 359e4c1 + 7b538cf
commit c7df53e
Showing 14 changed files with 46 additions and 24 deletions.
diff --git a/test/truffle/integration/backtraces/alias.backtrace b/test/truffle/integration/backtraces/alias.backtrace
@@ -0,0 +1,5 @@
+/alias.rb:19:in `block (2 levels) in <main>'
+/alias.rb:12:in `definition_name'
+/alias.rb:18:in `block in <main>'
+/backtraces.rb:17:in `check'
+/alias.rb:17:in `<main>'
diff --git a/test/truffle/integration/backtraces/alias.rb b/test/truffle/integration/backtraces/alias.rb
@@ -0,0 +1,21 @@
+# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+require_relative 'backtraces'
+
+def definition_name
+  yield
+end
+
+alias aliased_name definition_name
+
+check('alias.backtrace') do
+  aliased_name do
+    raise 'message'
+  end
+end
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -90,7 +90,11 @@ def self.find_jruby
   end
 
   def self.find_jruby_bin_dir
-    File.dirname(find_jruby)
+    if jruby_eclipse?
+      JRUBY_DIR + "/bin"
+    else
+      File.dirname(find_jruby)
+    end
   end
 
   def self.git_branch

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayUtils.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayUtils.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.core.array;
 
 import com.oracle.truffle.api.CompilerAsserts;
+
 import java.lang.reflect.Array;
 import java.util.Arrays;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeConstants.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeConstants.java
@@ -14,8 +14,6 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF8Encoding;
 
-import static org.jruby.truffle.core.rope.CodeRange.CR_7BIT;
-
 public class RopeConstants {
 
     public static final LeafRope EMPTY_ASCII_8BIT_ROPE;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java b/truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java
@@ -14,7 +14,6 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameInstance;
 import com.oracle.truffle.api.frame.FrameInstanceVisitor;
-import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java b/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java
@@ -18,7 +18,6 @@
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.RubyRootNode;
-import org.jruby.truffle.language.arguments.RubyArguments;
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.loader.SourceLoader;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
@@ -24,9 +24,9 @@
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.methods.DeclarationContext;
 import org.jruby.truffle.language.parser.ParserContext;
+
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 
 public class FeatureLoader {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/platform/darwin/DarwinPlatform.java b/truffle/src/main/java/org/jruby/truffle/platform/darwin/DarwinPlatform.java
@@ -24,10 +24,10 @@
 import org.jruby.truffle.platform.openjdk.OpenJDKArrayBlockingQueueLocksConditions;
 import org.jruby.truffle.platform.openjdk.OpenJDKLinkedBlockingQueueLocksConditions;
 import org.jruby.truffle.platform.posix.ClockGetTime;
-import org.jruby.truffle.platform.posix.JNRPosix;
+import org.jruby.truffle.platform.posix.JNRTrufflePosix;
 import org.jruby.truffle.platform.posix.Sockets;
-import org.jruby.truffle.platform.posix.TrufflePosixHandler;
 import org.jruby.truffle.platform.posix.TrufflePosix;
+import org.jruby.truffle.platform.posix.TrufflePosixHandler;
 import org.jruby.truffle.platform.signal.SignalManager;
 import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;
 
@@ -42,7 +42,7 @@ public class DarwinPlatform implements NativePlatform {
     private final RubiniusConfiguration rubiniusConfiguration;
 
     public DarwinPlatform(RubyContext context) {
-        posix = new JNRPosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
+        posix = new JNRTrufflePosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
         memoryManager = Runtime.getSystemRuntime().getMemoryManager();
         signalManager = new SunMiscSignalManager();
         processName = new DarwinProcessName();

diff --git a/truffle/src/main/java/org/jruby/truffle/platform/java/JavaPlatform.java b/truffle/src/main/java/org/jruby/truffle/platform/java/JavaPlatform.java
@@ -23,8 +23,8 @@
 import org.jruby.truffle.platform.openjdk.OpenJDKLinkedBlockingQueueLocksConditions;
 import org.jruby.truffle.platform.posix.ClockGetTime;
 import org.jruby.truffle.platform.posix.Sockets;
-import org.jruby.truffle.platform.posix.TrufflePosixHandler;
 import org.jruby.truffle.platform.posix.TrufflePosix;
+import org.jruby.truffle.platform.posix.TrufflePosixHandler;
 import org.jruby.truffle.platform.signal.SignalManager;
 import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;
 
@@ -39,7 +39,7 @@ public class JavaPlatform implements NativePlatform {
     private final RubiniusConfiguration rubiniusConfiguration;
 
     public JavaPlatform(RubyContext context) {
-        posix = new TruffleJavaPosix(POSIXFactory.getJavaPOSIX(new TrufflePosixHandler(context)));
+        posix = new JavaTrufflePosix(POSIXFactory.getJavaPOSIX(new TrufflePosixHandler(context)));
         memoryManager = new JavaMemoryManager();
         signalManager = new SunMiscSignalManager();
         processName = new JavaProcessName();

diff --git a/...uffle/platform/java/TruffleJavaPosix.java → ...uffle/platform/java/JavaTrufflePosix.java b/...uffle/platform/java/TruffleJavaPosix.java → ...uffle/platform/java/JavaTrufflePosix.java
@@ -14,7 +14,7 @@
 import jnr.constants.platform.OpenFlags;
 import jnr.posix.FileStat;
 import jnr.posix.POSIX;
-import org.jruby.truffle.platform.posix.JNRPosix;
+import org.jruby.truffle.platform.posix.JNRTrufflePosix;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -25,7 +25,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class TruffleJavaPosix extends JNRPosix {
+public class JavaTrufflePosix extends JNRTrufflePosix {
 
     private static class OpenFile {
 
@@ -53,7 +53,7 @@ public int getFlags() {
     private final AtomicInteger nextFileHandle = new AtomicInteger(3);
     private final Map<Integer, OpenFile> fileHandles = new ConcurrentHashMap<>();
 
-    public TruffleJavaPosix(POSIX delegateTo) {
+    public JavaTrufflePosix(POSIX delegateTo) {
         super(delegateTo);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/platform/linux/LinuxPlatform.java b/truffle/src/main/java/org/jruby/truffle/platform/linux/LinuxPlatform.java
@@ -24,10 +24,10 @@
 import org.jruby.truffle.platform.openjdk.OpenJDKArrayBlockingQueueLocksConditions;
 import org.jruby.truffle.platform.openjdk.OpenJDKLinkedBlockingQueueLocksConditions;
 import org.jruby.truffle.platform.posix.ClockGetTime;
-import org.jruby.truffle.platform.posix.JNRPosix;
+import org.jruby.truffle.platform.posix.JNRTrufflePosix;
 import org.jruby.truffle.platform.posix.Sockets;
-import org.jruby.truffle.platform.posix.TrufflePosixHandler;
 import org.jruby.truffle.platform.posix.TrufflePosix;
+import org.jruby.truffle.platform.posix.TrufflePosixHandler;
 import org.jruby.truffle.platform.signal.SignalManager;
 import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;
 
@@ -42,7 +42,7 @@ public class LinuxPlatform implements NativePlatform {
     private final RubiniusConfiguration rubiniusConfiguration;
 
     public LinuxPlatform(RubyContext context) {
-        posix = new JNRPosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
+        posix = new JNRTrufflePosix(POSIXFactory.getNativePOSIX(new TrufflePosixHandler(context)));
         memoryManager = Runtime.getSystemRuntime().getMemoryManager();
         signalManager = new SunMiscSignalManager();
         processName = new JavaProcessName();

diff --git a/...ruby/truffle/platform/posix/JNRPosix.java → ...uffle/platform/posix/JNRTrufflePosix.java b/...ruby/truffle/platform/posix/JNRPosix.java → ...uffle/platform/posix/JNRTrufflePosix.java
@@ -24,11 +24,11 @@
 import java.nio.ByteBuffer;
 import java.util.Collection;
 
-public class JNRPosix implements TrufflePosix {
+public class JNRTrufflePosix implements TrufflePosix {
 
     private final POSIX posix;
 
-    public JNRPosix(POSIX posix) {
+    public JNRTrufflePosix(POSIX posix) {
         this.posix = posix;
     }
 

diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -283,10 +283,5 @@ def self.omit(reason)
 require_relative 'core/config'
 require_relative 'core/main'
 
-# JRuby+Truffle C extension support
-require_relative 'core/truffle/cext/cext'
-require_relative 'core/truffle/cext/mkmf'
-require_relative 'core/truffle/cext/require'
-
 require_relative 'core/post'