Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 15, 2011
  1. @enebo

    IR: Change IRBuilder to use IRExectionScope instead of IRScope. Remov…

    enebo authored
    …e addInstr/getLastInstr from IRScope
  2. @nahi

    Avoid circular require caused by rubygems/maven_gemify

    nahi authored
    Re-applying patch at 409c61f
    
    Circular require detection logic was introduced by series of
    require/autoload fixes. The file rubygems/maven_gemify.rb caused 2
    circular-require-warnings for 1.9 mode.
    
    AFTER:
    
    % jruby 1.7.0.dev (ruby-1.9.2-p136) (2011-08-02 a70e633) (Java HotSpot(TM) 64-Bit Server VM 1.7.0) [linux-amd64-java]
    -e:1 warning: Useless use of a literal in void context.
    
    BEFORE:
    
    % jruby --1.9 -v -rdigest -e 0
    jruby 1.7.0.dev (ruby-1.9.2-p136) (2011-08-02 08c38b4) (Java HotSpot(TM) 64-Bit Server VM 1.6.0_26) [linux-amd64-java]
    /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/remote_fetcher.rb:1 warning: loading in progress, circular require considered harmful - rubygems
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/remote_fetcher.rb:1
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/remote_fetcher.rb:1
          Gem at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/spec_fetcher.rb:35
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/maven_gemify.rb:3
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/maven_gemify.rb:1
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb:1251
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems.rb:13
    /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/text.rb:1 warning: loading in progress, circular require considered harmful - rubygems
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/text.rb:1
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/text.rb:4
          Gem at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/spec_fetcher.rb:35
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/maven_gemify.rb:3
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/maven_gemify.rb:1
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb:1251
      require at org/jruby/RubyKernel.java:1034
       (root) at /home/nahi/git/jruby/lib/ruby/site_ruby/1.8/rubygems.rb:13
    -e:1 warning: Useless use of a literal in void context.
    
    Conflicts:
    
    	lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb
  3. @nahi

    JRUBY-6176: SecureRandom.uuid is not implemented

    nahi authored
    Merged securerandom.rb of CRuby 1.9, CRuby 1.8 and our forked one into
    the new securerandom.rb.  SecureRandom.uuid is enabled only in 1.9 mode.
    
    We should find a better way to maintain securerandom.rb.
Commits on Nov 14, 2011
  1. @subbuss

    [IR] Fix local opts pass to use "equals" instead of "=" to compare

    subbuss authored
    variables (duh!); replace non-side-effecting simplified instrs. with
    copies.
  2. @nicksieger

    Merge pull request #99 from koraktor/readbyte_18

    nicksieger authored
    IO#readbyte should be available in 1.8 too
  3. @subbuss
  4. @subbuss
  5. @subbuss
  6. @subbuss
  7. @subbuss
  8. @enebo
  9. @subbuss

    [IR] Fixed some bad return scenarios to throw LocalJumpErrors;

    subbuss authored
    throw RETRY_LocalJumpError for bad retries (rather than throwing
    RETURN_LocalJumpError); fixed bug (regression) in ThrowExceptionInstr
    to deal with IRExceptions; minor code refactoring.
  10. @enebo
  11. @BanzaiMan
  12. @subbuss

    [IR] Got rid of duplicate call stack maintained in the IR interpreter

    subbuss authored
    and used the call stack in the runtime to detect local jump errors.
  13. @subbuss
  14. @nahi

    JRUBY-6209: Hash#rehash did not work under some condition

    nahi authored
    It breaks hash because of wrong key hash recalculation.  It should call
    RubyHash#hashValue() because the actual hash could be changed by
    MRIHashValue() called from hashValue().
Commits on Nov 13, 2011
  1. @koraktor

    IO#readbyte should be available in 1.8 too

    koraktor authored
    JRuby presents itself as "jruby 1.6.5 (ruby-1.8.7-p330)" and MRI 1.8.7
    does support IO#readbyte.
  2. @subbuss

    [IR] Remove "%v = <const>" tmpvar copies and replace single uses of %v

    subbuss authored
    with <const> as long as there isn't a second definition of %v -- benefit
    of not reusing temporaries during IR building.
  3. @subbuss
  4. @subbuss
  5. @subbuss
  6. @BanzaiMan

    Bump macosx-version-min from 10.4 to 10.5.

    Matthew Denner authored BanzaiMan committed
    With this set at 10.4 the MacOS X compiler complains about '-rpath' only
    being applicable to 10.5 and above (noticed during 'gem install
    mysql2').  Bump it to 10.5 and the error is gone.
    
    Signed-off-by: Hiro Asari <asari.ruby@gmail.com>
  7. @BanzaiMan

    Revert "Override certain RbConfig::MAKEFILE_CONFIG values with enviro…

    BanzaiMan authored
    …nment variables. This resolves JRUBY-6199 in a more general way."
    
    Since MRI doesn't allow this, I'm going to revert this in this branch.
    
    This reverts commit 3d119a5.
Commits on Nov 12, 2011
  1. @subbuss

    [IR] Updated LocalOptimizationsPass to detect unused writes to temporary

    subbuss authored
    variables.  Replaced references of CallInstr to CallBase because we are
    now introducing NoResultCallInstr.
  2. @subbuss

    [IR] Temporary fix in dataflow analysis framework to work around a bug

    subbuss authored
    in DirectedGraph iterators.
  3. @subbuss
  4. @subbuss

    [IR] Made addUsedVariables abstract in Operand.java forcing all operands

    subbuss authored
    to implement this method -- because AsString hadn't implemented this and
    was piggybacking on Operand's empty implementation and caused an
    experimental code opt to crash.
  5. @subbuss

    [IR] Minor cleanup

    subbuss authored
  6. @enebo

    IR: No more interpreter context

    enebo authored
Commits on Nov 11, 2011
  1. @enebo

    IR: Remove temp vars from interpcontext and temporarily store them in…

    enebo authored
    … interpret method signatures
  2. @subbuss

    [IR] Redid nested arg receives: not mimicing tree walking explicitly

    subbuss authored
    anymore.  All non-root arg receives "(b,c)" in "|a,(b,c),d|" will now
    use GetArray to fetch their argument. So, we no longer need SetArguments
    and RestoreArguments instructions.  This also means that the incoming
    args array no longer need to be modified (as it was thus far).  This
    lets us pass this args array into interpret methods on the call stack
    rather than via a heap allocated InterpreterContext.
  3. @enebo
  4. @enebo
  5. @subbuss
Something went wrong with that request. Please try again.