-
-
Notifications
You must be signed in to change notification settings - Fork 925
Comparing changes
Open a pull request
base repository: jruby/jruby
base: fbed93d90ea3
head repository: jruby/jruby
compare: b3fc1ec0fa21
Commits on May 12, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 0269680 - Browse repository at this point
Copy the full SHA 0269680View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4e84246 - Browse repository at this point
Copy the full SHA 4e84246View commit details -
Refactor transcodeLoop into ruby and non-ruby parts.
In prep for a String-based transcode to address the test in #3877.
Configuration menu - View commit details
-
Copy full SHA for 8befbfe - Browse repository at this point
Copy the full SHA 8befbfeView commit details -
Merge pull request #3882 from jruby/refactor_transcode_loop
Refactor transcodeLoop into ruby and non-ruby parts.
Configuration menu - View commit details
-
Copy full SHA for 3b03bdf - Browse repository at this point
Copy the full SHA 3b03bdfView commit details -
Improve transcoding of Java String to bytes using joni.
Previously, if the target encoding was not supported by the JDK, we would be unable to encode the string and would just make it UTF-8. Now if there's no JDK support we will fall back on joni transcoding. Part of #3877 work.
7Configuration menu - View commit details
-
Copy full SHA for d025e43 - Browse repository at this point
Copy the full SHA d025e43View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4fde8c6 - Browse repository at this point
Copy the full SHA 4fde8c6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9cc6f52 - Browse repository at this point
Copy the full SHA 9cc6f52View commit details -
[Truffle] Fixed loading core files on Windows.
My previous fix for relative path names broke things on Windows. The problem is canonicalizing a path makes it fully qualified. On Linux & Mac, that's not a problem because the classpath root and the filesystem root use the same charact ('/'), but on Windows the filesystem root is 'C:\'. We need to normalize the path instead and then replace any backslashes with forward slashes to make it a valid path for the resource loader.
Configuration menu - View commit details
-
Copy full SHA for fdb2b6d - Browse repository at this point
Copy the full SHA fdb2b6dView commit details -
Configuration menu - View commit details
-
Copy full SHA for dd81c00 - Browse repository at this point
Copy the full SHA dd81c00View commit details -
Configuration menu - View commit details
-
Copy full SHA for 344ffb4 - Browse repository at this point
Copy the full SHA 344ffb4View commit details -
Configuration menu - View commit details
-
Copy full SHA for bc9df5f - Browse repository at this point
Copy the full SHA bc9df5fView commit details -
Also check content of encoded File.basename result.
Triggers bug discovered by @ahorek here: d025e43#commitcomment-17451035
Configuration menu - View commit details
-
Copy full SHA for e3b8e8c - Browse repository at this point
Copy the full SHA e3b8e8cView commit details -
Configuration menu - View commit details
-
Copy full SHA for c28f62a - Browse repository at this point
Copy the full SHA c28f62aView commit details -
Re-port Array#hash and some related logic to fix #3884.
It appears MRI defers recursion detection to the elements of an array and has other logic for combining hashes of those elements. I also added better initial hash value similar to MRI's use of a pointer in memory, which appears to be the main thing helping this issue, since now the hash of an empty array is a useful number.
Configuration menu - View commit details
-
Copy full SHA for 1b92064 - Browse repository at this point
Copy the full SHA 1b92064View commit details -
Add a spec for hashing a double-nested array with inner zarray.
Relates to #3884, where JRuby was always returning the same hash for certain combinations of nested array with an innermost empty array.
2Configuration menu - View commit details
-
Copy full SHA for ac53c54 - Browse repository at this point
Copy the full SHA ac53c54View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9334a2b - Browse repository at this point
Copy the full SHA 9334a2bView commit details -
Fixes #3680. JRuby and devise Null pointer exception
This was largely just some code which was added before prepend existed. It would re-wrap begin and end of a range and make an array and call min on that. This would obviously not have anything prepended on it and it would not even be the same type. I ended up re-porting min and max in range from MRI since I found another mistake with min(a) and max(a) not passing a to super if invoked in the block form. This also makes us a tiny bit faster since we end up only doing on cmp in cases of fixnums (why is this even optimized by MRI :) ).
Configuration menu - View commit details
-
Copy full SHA for d0fe3c0 - Browse repository at this point
Copy the full SHA d0fe3c0View commit details
Commits on May 13, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f5da86f - Browse repository at this point
Copy the full SHA f5da86fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4658edd - Browse repository at this point
Copy the full SHA 4658eddView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4971aae - Browse repository at this point
Copy the full SHA 4971aaeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8310821 - Browse repository at this point
Copy the full SHA 8310821View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5508a08 - Browse repository at this point
Copy the full SHA 5508a08View commit details -
Configuration menu - View commit details
-
Copy full SHA for 41e728b - Browse repository at this point
Copy the full SHA 41e728bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 02d6818 - Browse repository at this point
Copy the full SHA 02d6818View commit details -
Configuration menu - View commit details
-
Copy full SHA for 72e21d3 - Browse repository at this point
Copy the full SHA 72e21d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for a142e0b - Browse repository at this point
Copy the full SHA a142e0bView commit details -
[Truffle] Add a CheckLayoutNode to cache the Shape when doing isRuby<…
…Type> checks. * Just an identity or a Shape check instead of (3 reads + instanceof). The instanceof folds away if the Shape is compilation constant as then the ObjecctType is compilation constant as well.
3Configuration menu - View commit details
-
Copy full SHA for 72a1908 - Browse repository at this point
Copy the full SHA 72a1908View commit details -
Configuration menu - View commit details
-
Copy full SHA for 48d98fd - Browse repository at this point
Copy the full SHA 48d98fdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3581134 - Browse repository at this point
Copy the full SHA 3581134View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61cbc8c - Browse repository at this point
Copy the full SHA 61cbc8cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4f9eeb5 - Browse repository at this point
Copy the full SHA 4f9eeb5View commit details
Commits on May 14, 2016
-
Revert "Re-port Array#hash and some related logic to fix #3884."
This reverts commit 1b92064.
Configuration menu - View commit details
-
Copy full SHA for 89d8af7 - Browse repository at this point
Copy the full SHA 89d8af7View commit details -
The fix here is as follows: * Always provide a non-zero hash for any array, including empty. * Better hash combination function with less collision. An improved recursion guard will go into the next release.
Configuration menu - View commit details
-
Copy full SHA for f1e056b - Browse repository at this point
Copy the full SHA f1e056bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c07af6c - Browse repository at this point
Copy the full SHA c07af6cView commit details -
Configuration menu - View commit details
-
Copy full SHA for be480ba - Browse repository at this point
Copy the full SHA be480baView commit details -
Merge branch 'master' into truffle-head
# Conflicts: # tool/jt.rb
Configuration menu - View commit details
-
Copy full SHA for 16ed170 - Browse repository at this point
Copy the full SHA 16ed170View commit details -
Configuration menu - View commit details
-
Copy full SHA for b3fc1ec - Browse repository at this point
Copy the full SHA b3fc1ecView commit details
There are no files selected for viewing