jruby · Jun 22, 2015 · Jun 22, 2015 · Jun 22, 2015 · Jun 22, 2015 · Jun 22, 2015
diff --git a/core/src/main/java/org/jruby/util/JRubyFile.java b/core/src/main/java/org/jruby/util/JRubyFile.java
@@ -108,7 +108,8 @@ private static FileResource createResource(Ruby runtime, String cwd, String path
             }
         }
 
-        if (cwd != null && (cwd.startsWith("uri:") || cwd.startsWith("file:"))) {
+        File internal = new JavaSecuredFile(pathname);
+        if (cwd != null && !internal.isAbsolute() && (cwd.startsWith("uri:") || cwd.startsWith("file:"))) {
             return createResource(runtime, null, cwd + "/" + pathname);
         }
 
@@ -133,14 +134,15 @@ private static JRubyFile createNoUnicodeConversion(String cwd, String pathname)
             pathname = pathname.substring(5);
         }
         File internal = new JavaSecuredFile(pathname);
-        if(cwd != null && cwd.startsWith("uri:") && !pathname.startsWith("uri:") && !pathname.contains("!/") && !internal.isAbsolute()) {
+        if (internal.isAbsolute()) {
+            return new JRubyFile(internal);
+        }
+        if(cwd != null && cwd.startsWith("uri:") && !pathname.startsWith("uri:") && !pathname.contains("!/")) {
             return new JRubyFile(cwd + "/" + pathname);
         }
+        internal = new JavaSecuredFile(cwd, pathname);
         if(!internal.isAbsolute()) {
-            internal = new JavaSecuredFile(cwd, pathname);
-            if(!internal.isAbsolute()) {
-                throw new IllegalArgumentException("Neither current working directory ("+cwd+") nor pathname ("+pathname+") led to an absolute path");
-            }
+            throw new IllegalArgumentException("Neither current working directory ("+cwd+") nor pathname ("+pathname+") led to an absolute path");
         }
         return new JRubyFile(internal);
     }

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -29,7 +29,7 @@ def version
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
    ImportedGem.new( 'psych', '2.0.14.pre1', true ),
    ImportedGem.new( 'json', 'json.version', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.14', true )
+   ImportedGem.new( 'jar-dependencies', '0.1.15', true )
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.1.14</version>
+      <version>0.1.15</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>

diff --git a/spec/truffle/tags/core/env/element_set_tags.txt b/spec/truffle/tags/core/env/element_set_tags.txt
diff --git a/spec/truffle/tags/core/env/has_value_tags.txt b/spec/truffle/tags/core/env/has_value_tags.txt
diff --git a/spec/truffle/tags/core/env/reject_tags.txt b/spec/truffle/tags/core/env/reject_tags.txt
diff --git a/spec/truffle/tags/core/env/shift_tags.txt b/spec/truffle/tags/core/env/shift_tags.txt
diff --git a/spec/truffle/tags/core/env/size_tags.txt b/spec/truffle/tags/core/env/size_tags.txt
diff --git a/spec/truffle/tags/core/env/store_tags.txt b/spec/truffle/tags/core/env/store_tags.txt
diff --git a/spec/truffle/tags/core/env/to_a_tags.txt b/spec/truffle/tags/core/env/to_a_tags.txt
diff --git a/spec/truffle/tags/core/env/to_h_tags.txt b/spec/truffle/tags/core/env/to_h_tags.txt
diff --git a/spec/truffle/tags/core/env/to_hash_tags.txt b/spec/truffle/tags/core/env/to_hash_tags.txt
diff --git a/spec/truffle/tags/core/env/to_s_tags.txt b/spec/truffle/tags/core/env/to_s_tags.txt
diff --git a/spec/truffle/tags/core/env/value_tags.txt b/spec/truffle/tags/core/env/value_tags.txt
diff --git a/spec/truffle/tags/core/env/values_at_tags.txt b/spec/truffle/tags/core/env/values_at_tags.txt
diff --git a/spec/truffle/tags/core/env/values_tags.txt b/spec/truffle/tags/core/env/values_tags.txt
diff --git a/spec/truffle/tags/core/hash/reject_tags.txt b/spec/truffle/tags/core/hash/reject_tags.txt
diff --git a/spec/truffle/tags/library/base64/decode64_tags.txt b/spec/truffle/tags/library/base64/decode64_tags.txt
diff --git a/spec/truffle/tags/library/bigdecimal/add_tags.txt b/spec/truffle/tags/library/bigdecimal/add_tags.txt
@@ -1,9 +1,6 @@
 fails:BigDecimal#add favors the precision specified in the second argument over the global limit
 fails:BigDecimal#add uses the current rounding mode if rounding is needed
-fails:BigDecimal#add uses the default ROUND_HALF_UP rounding if it wasn't explicitly changed
 fails:BigDecimal#add returns NaN if NaN is involved
 fails:BigDecimal#add returns Infinity or -Infinity if these are involved
 fails:BigDecimal#add returns NaN if Infinity + (- Infinity)
-fails:BigDecimal#add raises TypeError when adds nil
-fails:BigDecimal#add raises TypeError when precision parameter is nil
 fails:BigDecimal#add raises ArgumentError when precision parameter is negative
diff --git a/spec/truffle/tags/library/bigdecimal/ceil_tags.txt b/spec/truffle/tags/library/bigdecimal/ceil_tags.txt
@@ -1,4 +1,3 @@
-fails:BigDecimal#ceil returns an Integer, if n is unspecified
 fails:BigDecimal#ceil returns a BigDecimal, if n is specified
 fails:BigDecimal#ceil returns the smallest integer greater or equal to self, if n is unspecified
 fails:BigDecimal#ceil raise exception, if self is special value

diff --git a/spec/truffle/tags/library/bigdecimal/div_tags.txt b/spec/truffle/tags/library/bigdecimal/div_tags.txt
@@ -8,7 +8,6 @@ fails:BigDecimal#div returns a / b with optional precision
 fails:BigDecimal#div raises FloatDomainError if NaN is involved
 fails:BigDecimal#div returns 0 if divided by Infinity and no precision given
 fails:BigDecimal#div returns 0 if divided by Infinity with given precision
-fails:BigDecimal#div raises ZeroDivisionError if divided by zero and no precision given
 fails:BigDecimal#div returns NaN if zero is divided by zero
 fails:BigDecimal#div raises FloatDomainError if (+|-) Infinity divided by 1 and no precision given
 fails:BigDecimal#div returns (+|-)Infinity if (+|-)Infinity by 1 and precision given

diff --git a/spec/truffle/tags/library/bigdecimal/divmod_tags.txt b/spec/truffle/tags/library/bigdecimal/divmod_tags.txt
@@ -4,12 +4,10 @@ fails:BigDecimal#mod_part_of_divmod returns NaN if NaN is involved
 fails:BigDecimal#mod_part_of_divmod returns NaN if the dividend is Infinity
 fails:BigDecimal#mod_part_of_divmod returns the dividend if the divisor is Infinity
 fails:BigDecimal#mod_part_of_divmod raises TypeError if the argument cannot be coerced to BigDecimal
-fails:BigDecimal#mod_part_of_divmod raises ZeroDivisionError if other is zero
 fails:BigDecimal#divmod divides value, returns an array
 fails:BigDecimal#divmod array contains quotient and modulus as BigDecimal
 fails:BigDecimal#divmod Can be reversed with * and +
 fails:BigDecimal#divmod returns an array of two NaNs if NaN is involved
-fails:BigDecimal#divmod raises ZeroDivisionError if the divisor is zero
 fails:BigDecimal#divmod returns an array of Infinity and NaN if the dividend is Infinity
 fails:BigDecimal#divmod returns an array of zero and the dividend if the divisor is Infinity
 fails:BigDecimal#divmod returns an array of two zero if the diviend is zero

diff --git a/spec/truffle/tags/library/bigdecimal/inspect_tags.txt b/spec/truffle/tags/library/bigdecimal/inspect_tags.txt
@@ -1,7 +1,6 @@
-fails:BigDecimal#inspect returns String
-fails:BigDecimal#inspect returns String starting with #
 fails:BigDecimal#inspect encloses information in angle brackets
 fails:BigDecimal#inspect is comma separated list of three items
 fails:BigDecimal#inspect value after first comma is value as string
 fails:BigDecimal#inspect last part is number of significant digits
 fails:BigDecimal#inspect looks like this
+fails:BigDecimal#inspect returns String starting with #
diff --git a/spec/truffle/tags/library/bigdecimal/modulo_tags.txt b/spec/truffle/tags/library/bigdecimal/modulo_tags.txt
@@ -4,11 +4,9 @@ fails:BigDecimal#% returns NaN if NaN is involved
 fails:BigDecimal#% returns NaN if the dividend is Infinity
 fails:BigDecimal#% returns the dividend if the divisor is Infinity
 fails:BigDecimal#% raises TypeError if the argument cannot be coerced to BigDecimal
-fails:BigDecimal#% raises ZeroDivisionError if other is zero
 fails:BigDecimal#modulo returns self modulo other
 fails:BigDecimal#modulo returns a [Float value] when the argument is Float
 fails:BigDecimal#modulo returns NaN if NaN is involved
 fails:BigDecimal#modulo returns NaN if the dividend is Infinity
 fails:BigDecimal#modulo returns the dividend if the divisor is Infinity
 fails:BigDecimal#modulo raises TypeError if the argument cannot be coerced to BigDecimal
-fails:BigDecimal#modulo raises ZeroDivisionError if other is zero
diff --git a/spec/truffle/tags/library/complex/math/acos_tags.txt b/spec/truffle/tags/library/complex/math/acos_tags.txt
@@ -1,6 +1,4 @@
-fails:Math#acos returns the arccosine for Complex numbers
 fails:Math#acos returns the arccosine for numbers greater than 1.0 as a Complex number
 fails:Math#acos returns the arccosine for numbers less than -1.0 as a Complex number
-fails:Math.acos returns the arccosine for Complex numbers
 fails:Math.acos returns the arccosine for numbers greater than 1.0 as a Complex number
-fails:Math.acos returns the arccosine for numbers less than -1.0 as a Complex number
+fails:Math.acos returns the arccosine for numbers less than -1.0 as a Complex number
diff --git a/spec/truffle/tags/library/complex/math/asin_tags.txt b/spec/truffle/tags/library/complex/math/asin_tags.txt
diff --git a/spec/truffle/tags/library/complex/math/atan2_tags.txt b/spec/truffle/tags/library/complex/math/atan2_tags.txt
diff --git a/spec/truffle/tags/library/conditionvariable/broadcast_tags.txt b/spec/truffle/tags/library/conditionvariable/broadcast_tags.txt
diff --git a/spec/truffle/tags/library/conditionvariable/signal_tags.txt b/spec/truffle/tags/library/conditionvariable/signal_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegate_class/private_instance_methods_tags.txt b/spec/truffle/tags/library/delegate/delegate_class/private_instance_methods_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegator/case_compare_tags.txt b/spec/truffle/tags/library/delegate/delegator/case_compare_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegator/compare_tags.txt b/spec/truffle/tags/library/delegate/delegator/compare_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegator/eql_tags.txt b/spec/truffle/tags/library/delegate/delegator/eql_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegator/hash_tags.txt b/spec/truffle/tags/library/delegate/delegator/hash_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegator/marshal_tags.txt b/spec/truffle/tags/library/delegate/delegator/marshal_tags.txt
diff --git a/spec/truffle/tags/library/delegate/delegator/public_methods_tags.txt b/spec/truffle/tags/library/delegate/delegator/public_methods_tags.txt
diff --git a/spec/truffle/tags/library/erb/defmethod/def_erb_method_tags.txt b/spec/truffle/tags/library/erb/defmethod/def_erb_method_tags.txt
diff --git a/spec/truffle/tags/library/getoptlong/initialize_tags.txt b/spec/truffle/tags/library/getoptlong/initialize_tags.txt
diff --git a/spec/truffle/tags/library/ipaddr/hton_tags.txt b/spec/truffle/tags/library/ipaddr/hton_tags.txt
diff --git a/spec/truffle/tags/library/logger/device/close_tags.txt b/spec/truffle/tags/library/logger/device/close_tags.txt
diff --git a/spec/truffle/tags/library/logger/device/new_tags.txt b/spec/truffle/tags/library/logger/device/new_tags.txt
diff --git a/spec/truffle/tags/library/logger/device/write_tags.txt b/spec/truffle/tags/library/logger/device/write_tags.txt
diff --git a/spec/truffle/tags/library/socket/basicsocket/close_read_tags.txt b/spec/truffle/tags/library/socket/basicsocket/close_read_tags.txt
@@ -2,5 +2,4 @@ fails:Socket::BasicSocket#close_read closes the reading end of the socket
 fails:Socket::BasicSocket#close_read it works on sockets with closed ends
 fails:Socket::BasicSocket#close_read does not close the socket
 fails:Socket::BasicSocket#close_read fully closes the socket if it was already closed for writing
-fails:Socket::BasicSocket#close_read raises IOError on closed socket
 fails:Socket::BasicSocket#close_read returns nil
diff --git a/spec/truffle/tags/library/socket/basicsocket/close_write_tags.txt b/spec/truffle/tags/library/socket/basicsocket/close_write_tags.txt
@@ -2,5 +2,4 @@ fails:Socket::BasicSocket#close_write closes the writing end of the socket
 fails:Socket::BasicSocket#close_write works on sockets with closed write ends
 fails:Socket::BasicSocket#close_write does not close the socket
 fails:Socket::BasicSocket#close_write fully closes the socket if it was already closed for reading
-fails:Socket::BasicSocket#close_write raises IOError on closed socket
 fails:Socket::BasicSocket#close_write returns nil
diff --git a/spec/truffle/tags/library/socket/basicsocket/for_fd_tags.txt b/spec/truffle/tags/library/socket/basicsocket/for_fd_tags.txt
diff --git a/spec/truffle/tags/library/socket/basicsocket/getsockname_tags.txt b/spec/truffle/tags/library/socket/basicsocket/getsockname_tags.txt
diff --git a/spec/truffle/tags/library/strscan/element_reference_tags.txt b/spec/truffle/tags/library/strscan/element_reference_tags.txt
diff --git a/spec/truffle/tags/library/strscan/getbyte_tags.txt b/spec/truffle/tags/library/strscan/getbyte_tags.txt
diff --git a/spec/truffle/tags/library/strscan/getch_tags.txt b/spec/truffle/tags/library/strscan/getch_tags.txt
diff --git a/spec/truffle/tags/library/strscan/matched_tags.txt b/spec/truffle/tags/library/strscan/matched_tags.txt
diff --git a/spec/truffle/tags/library/strscan/matchedsize_tags.txt b/spec/truffle/tags/library/strscan/matchedsize_tags.txt
diff --git a/spec/truffle/tags/library/strscan/peek_tags.txt b/spec/truffle/tags/library/strscan/peek_tags.txt
diff --git a/spec/truffle/tags/library/strscan/peep_tags.txt b/spec/truffle/tags/library/strscan/peep_tags.txt
diff --git a/spec/truffle/tags/library/strscan/post_match_tags.txt b/spec/truffle/tags/library/strscan/post_match_tags.txt
diff --git a/spec/truffle/tags/library/strscan/pre_match_tags.txt b/spec/truffle/tags/library/strscan/pre_match_tags.txt
diff --git a/spec/truffle/tags/library/strscan/rest_tags.txt b/spec/truffle/tags/library/strscan/rest_tags.txt
diff --git a/spec/truffle/tags/library/strscan/scan_tags.txt b/spec/truffle/tags/library/strscan/scan_tags.txt
diff --git a/spec/truffle/tags/library/strscan/scan_until_tags.txt b/spec/truffle/tags/library/strscan/scan_until_tags.txt
diff --git a/spec/truffle/tags/library/thread/sizedqueue/deq_tags.txt b/spec/truffle/tags/library/thread/sizedqueue/deq_tags.txt
diff --git a/spec/truffle/tags/library/thread/sizedqueue/pop_tags.txt b/spec/truffle/tags/library/thread/sizedqueue/pop_tags.txt
diff --git a/spec/truffle/tags/library/thread/sizedqueue/shift_tags.txt b/spec/truffle/tags/library/thread/sizedqueue/shift_tags.txt
diff --git a/spec/truffle/tags/library/tmpdir/dir/tmpdir_tags.txt b/spec/truffle/tags/library/tmpdir/dir/tmpdir_tags.txt
diff --git a/test/jruby/test_file.rb b/test/jruby/test_file.rb
@@ -964,6 +964,27 @@ def test_file_utf8
     end
   end
 
+  # GH-3074
+  def test_file_with_absolute_path_and_uri_path_as_cwd
+    filename = File.expand_path( 'test_absolute_path_and_uri_path_as_cwd' )
+
+    Dir.chdir('uri:classloader:/') do
+      begin
+        f = File.new(filename, File::CREAT)
+        assert_equal(nil, f.read(1))
+
+        assert File.file?(filename)
+        assert File.exist?(filename)
+      ensure
+        f.close
+        File.delete(filename)
+
+        assert !File.file?(filename)
+        assert !File.exist?(filename)
+      end
+    end
+  end
+
   def test_file_create
     filename = '2nnever'
     f = File.new(filename, File::CREAT)

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -15,7 +15,7 @@
   repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
               :id => 'truffle' )
 
-  truffle_version = '0.8-ef8c90391f1ec21bcfb6d5c6fb39757b860d4973-SNAPSHOT'
+  truffle_version = '0.8-ff6f34159b8a2d7149e384b67b0bb007e79c8a75-SNAPSHOT'
   jar 'com.oracle:truffle:' + truffle_version
   jar 'com.oracle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'
   jar 'com.oracle:truffle-tck:' + truffle_version, :scope => 'test'

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -24,18 +24,18 @@
     <dependency>
       <groupId>com.oracle</groupId>
       <artifactId>truffle</artifactId>
-      <version>0.8-ef8c90391f1ec21bcfb6d5c6fb39757b860d4973-SNAPSHOT</version>
+      <version>0.8-ff6f34159b8a2d7149e384b67b0bb007e79c8a75-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle</groupId>
       <artifactId>truffle-dsl-processor</artifactId>
-      <version>0.8-ef8c90391f1ec21bcfb6d5c6fb39757b860d4973-SNAPSHOT</version>
+      <version>0.8-ff6f34159b8a2d7149e384b67b0bb007e79c8a75-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.oracle</groupId>
       <artifactId>truffle-tck</artifactId>
-      <version>0.8-ef8c90391f1ec21bcfb6d5c6fb39757b860d4973-SNAPSHOT</version>
+      <version>0.8-ff6f34159b8a2d7149e384b67b0bb007e79c8a75-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
@@ -16,6 +16,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.core.FloatNodes;
 import org.jruby.truffle.nodes.core.FloatNodesFactory;
@@ -42,6 +43,11 @@ public int doInt(VirtualFrame frame, Object object) {
             return (int) integerObject;
         }
 
+        if (RubyGuards.isRubyBignum(object)) {
+            CompilerDirectives.transferToInterpreter();
+            throw new RaiseException(getContext().getCoreLibrary().rangeError("bignum too big to convert into `long'", this));
+        }
+
         CompilerDirectives.transferToInterpreter();
         throw new UnsupportedOperationException();
     }
@@ -60,7 +66,8 @@ public long coerceLong(long value) {
 
     @Specialization(guards = "isRubyBignum(value)")
     public RubyBasicObject coerceRubyBignum(RubyBasicObject value) {
-        return value;
+        CompilerDirectives.transferToInterpreter();
+        throw new RaiseException(getContext().getCoreLibrary().rangeError("bignum too big to convert into `long'", this));
     }
 
     @Specialization

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethod.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethod.java
@@ -27,22 +27,25 @@
 
     /**
      * Defines the method on the singleton class.
-     * {@link needsSelf} is always false.
+     * {@link #needsSelf() needsSelf} is always false.
+     * See {@link #constructor() constructor} if you need self.
      * */
     boolean onSingleton() default false;
 
     /**
-     * Like {@link #onSingleton()} but with {@link #needsSelf()} always true.
+     * Like {@link #onSingleton() onSingleton} but with {@link #needsSelf() needsSelf} always true.
      */
     boolean constructor() default false;
 
     /**
      * Defines the method as public on the singleton class
      * and as a private instance method.
-     * {@link needsSelf} is always false.
+     * {@link #needsSelf() needsSelf} is always false
+     * as it could be either a module or any receiver.
      */
     boolean isModuleFunction() default false;
 
+    /** Whether <code>self</code> is passed as first argument to specializations. */
     boolean needsSelf() default true;
 
     int required() default 0;