Merge to update #1

chrisseaton · 2015-02-04T21:58:01Z

It's really important you keep the branch up to date so I can help you most effectively. This merge was already non-trivial and at the moment I can't run a.rb - I get this:

$ jt run --graal core/a.rb 
core/a.rb:1:in `<main>': wrong number of arguments (4 for 0) (ArgumentError)
    from core/a.rb:20:in `<main>'
    from core/a.rb:18:in `each'
    from core/a.rb:18:in `<main>'
    from core/a.rb:9:in `each'
    from core/a.rb:9:in `<main>'

(jt is our helper tool - see tool/jt.rb).

Is that right?

Fixed a bug with local_variables ordering and duplicate variables

...to avoid recompiling it every time.

…ar to truffle

Forgot to match the order of JRuby local variables spec to MRI

add an option which allows to switch to a self-first strategy which might be able to solve some classloader conflicts. keep the old tests using the switch to use the SelfFirstClassLoader

…eption.

To reduce duplicate code between CheckArityNode, ReadKeywordArgumentNode, ReadKeywordRestArgumentNode move the getKeywordsHash method into RubyArguments - where all the other argument helper functions live.

[Truffle] deduplicate getKeywordsHash into RubyArguments

The keys must be Strings, not Symbols. I've also added some common keys used by other implementations. Finally, the OS will identify as Win32 on Windows, which activates a bunch of Windows-specific logic in RubySpec.

* New design so assumptionInvalidated() drives all barrier synchronizations. * The global lock is now better separated from barrier synchronization. * Support interrupts of the barrier by re-creating it (should be relatively rare).

* Done with: $ ruby spec/mspec/bin/mspec tag --unguarded --all --add fails -B spec/truffle/truffle.mspec spec/ruby/core/argf -Z

* Takes 8s alone!

When a keyword argument is not used in the method body there is no frame slot for the argument resulting a NullPointerException when writing the argument to the frame. This fix changes the AST translator to create the frame slot if it cannot be found by using `findOrAddFrameSlot` instead of `findFrameSlot`.

[Truffle] Fix null FrameSlot when kwarg is not used

Move methods from BasicObject to Object

…s, (trace child)]

… it.

* So callers do not need to know these details.

…s().

…exing.

Conflicts: truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/CheckArityNode.java truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordArgumentNode.java truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java

fniephaus · 2015-02-04T22:05:29Z

Thanks a lot, Chris.
We have to present our findings and implementation tomorrow which is why we weren't able to keep the branch up-to-date.
We'll follow up on this as soon as we can.

Merge to update

GennadySpb and others added 30 commits January 27, 2015 12:53

Implement pack & unpacking ipv6 address in sockaddr

727721b

Modified the make_wstr method so that it appends a null character.

a392065

Uh...

c601151

Fixed a bug with local_variables ordering and duplicate variables

0d080fc

Merge pull request jruby#2526 from Who828/local_variables_bug

7713b6b

Fixed a bug with local_variables ordering and duplicate variables

Hack to make package-info.java emit a dummy class.

09721d6

...to avoid recompiling it every time.

Make lib depend on truffle for jruby-truffle jar.

dbdfc4e

Have jruby-core and jruby-truffle shade into lib.

576ecb3

[build] bring shaded lib/jruby.jar back and limit lib/jruby-truffle.j…

4f534b8

…ar to truffle

Forgot to match the order of JRuby local variables spec to MRI

ccb45cc

Merge pull request jruby#2530 from Who828/local_variables_bug

d12289e

Forgot to match the order of JRuby local variables spec to MRI

make the regular classloader load path default again

580bd4e

add an option which allows to switch to a self-first strategy which might be able to solve some classloader conflicts. keep the old tests using the switch to use the SelfFirstClassLoader

[Truffle] Read files interruptedly and deal with ClosedByInterruptExc…

33c7f7e

…eption.

[Truffle] deduplicate getKeywordsHash into RubyArguments

2caf50c

To reduce duplicate code between CheckArityNode, ReadKeywordArgumentNode, ReadKeywordRestArgumentNode move the getKeywordsHash method into RubyArguments - where all the other argument helper functions live.

Merge pull request jruby#2532 from mswart/dedubGetKeywordsHash

451fb60

[Truffle] deduplicate getKeywordsHash into RubyArguments

[Truffle] Remove workaround executable.

4ef07df

[Truffle] Update File constants to match MRI and non-Truffle JRuby.

5fc0fd5

[Truffle] Some updates to RbConfig::CONFIG.

c73f8e2

The keys must be Strings, not Symbols. I've also added some common keys used by other implementations. Finally, the OS will identify as Win32 on Windows, which activates a bunch of Windows-specific logic in RubySpec.

[Truffle] Apparently reporting the version number broke some specs.

62c5247

[Truffle] Separate class loading from initialization.

1a7f688

[Truffle] Refactor and fix SafepointManager.

973a03f

* New design so assumptionInvalidated() drives all barrier synchronizations. * The global lock is now better separated from barrier synchronization. * Support interrupts of the barrier by re-creating it (should be relatively rare).

[Truffle] Tag ARGF specs failing on windows

c06d6f5

* Done with: $ ruby spec/mspec/bin/mspec tag --unguarded --all --add fails -B spec/truffle/truffle.mspec spec/ruby/core/argf -Z

[Truffle] Tag a slow spec as such.

c15b6e9

* Takes 8s alone!

Move #itself from BasicObject to Object

c2184b5

Move #object_id method from BasicObject to Object

519fd75

Remove deprecated Object#id method (removed in Ruby 1.9.3)

0ce0215

Merge pull request jruby#2535 from jgraichen/unused-kwarg

47f9a70

[Truffle] Fix null FrameSlot when kwarg is not used

Merge pull request jruby#2520 from sferik/move_methods_to_object

a003621

Move methods from BasicObject to Object

[Truffle] Flatten the AST at new lines [pass, trace, child], not [pas…

effa2bc

…s, (trace child)]

eregon and others added 25 commits February 4, 2015 11:31

[Truffle] Move Rubinius::UNDEFINED to Java so we can have a guard for…

186bb63

… it.

[Truffle] Improve Kernel#sleep for Mutex specs.

147cbea

[Truffle] Implement Mutex and pass all specs but one.

af8e1c9

[Truffle] Fix the last failing Mutex spec.

b2f4f39

RubySpec: Add a comment.

ce066de

[Truffle] Basic Thread#wakeup.

e91e650

[Truffle] JT: show all arguments in untag warning.

5685994

[Truffle] Last spec of Kernel#sleep.

f140b23

[Truffle] Move Truffle's core Ruby files to the Truffle jar.

8105ed9

Update.

44fda12

Update.

5db86b4

[Truffle] Let CoreLibrary do the error formatting.

82b183b

* So callers do not need to know these details.

[Truffle] Introduce a NumericToFloatNode.

955703b

[Truffle] Fix race condition between Thread#join and releaseOwnedLock…

96e4133

…s().

Update.

c63ec2f

[Truffle] Divide up the large number of specialisations for array ind…

9da6ed4

…exing.

Update.

7e03148

Update.

844c4b1

[Truffle] Array#[]= beyond the end of the array.

dcc29bf

[Truffle] Kernel#gets should try harder to get a line.

8b64d4f

Update.

85a03b2

[Truffle] Fixed infinite loop in String#split(Regexp).

75ec034

[Truffle] Support limit on String#split(Regexp).

5e267b6

[Truffle] @child and @children needed for RubyNode fields.

f5867a6

fniephaus added a commit that referenced this pull request Feb 5, 2015

Merge pull request #1 from chrisseaton/matthias-adv

6990a57

Merge to update

fniephaus merged commit 6990a57 into fniephaus:master Feb 5, 2015

This was referenced Feb 5, 2015

JRuby+Truffle: Keyword Arguments Optimization jruby/jruby#2567

Closed

JRuby+Truffle: Keyword Arguments Optimization jruby/jruby#2588

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge to update #1

Merge to update #1

chrisseaton commented Feb 4, 2015

fniephaus commented Feb 4, 2015

Merge to update #1

Merge to update #1

Conversation

chrisseaton commented Feb 4, 2015

fniephaus commented Feb 4, 2015