Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 85b0a219d9a4
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84c440955a1f
Choose a head ref
  • 12 commits
  • 69 files changed
  • 1 contributor

Commits on Feb 23, 2016

  1. [Truffle] Adopt the OM DSL.

    @chrisseaton
    chrisseaton committed Feb 23, 2016
    Copy the full SHA
    b179b13 View commit details

  2. Merge branch 'truffle-head' into truffle-om-dsl

    @chrisseaton
    chrisseaton committed Feb 23, 2016
    Copy the full SHA
    11af570 View commit details

  3. [Truffle] Don't use fully qualified interface name.

    @chrisseaton
    chrisseaton committed Feb 23, 2016
    Copy the full SHA
    0bf6f7a View commit details

Commits on Mar 4, 2016

  1. [Truffle] OM-DSL processor jar is no more.

    @chrisseaton
    chrisseaton committed Mar 4, 2016
    Copy the full SHA
    6972c05 View commit details

  2. Merge branch 'truffle-head' into truffle-om-dsl 

    # Conflicts:
#	truffle/pom.rb
#	truffle/pom.xml
#	truffle/src/main/java/org/jruby/truffle/core/string/StringLayout.java
    @chrisseaton
    chrisseaton committed Mar 4, 2016
    Copy the full SHA
    bea8aa7 View commit details

  3. [Truffle] We don't want implicitCastIntToDouble.

    @chrisseaton
    chrisseaton committed Mar 4, 2016
    Copy the full SHA
    35d0aa8 View commit details

Commits on Mar 5, 2016

  1. [Truffle] sed that works on Linux.

    @chrisseaton
    chrisseaton committed Mar 5, 2016
    Copy the full SHA
    af70588 View commit details

Commits on Mar 6, 2016

  1. [Truffle] Remove some old cext stuff.

    @chrisseaton
    chrisseaton committed Mar 6, 2016
    Copy the full SHA
    d8222ca View commit details

Commits on Mar 7, 2016

  1. [Truffle] Update Truffle version.

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    764a21e View commit details

  2. Merge branch 'truffle-om-dsl' into truffle-head 

    # Conflicts:
#	truffle/pom.rb
#	truffle/pom.xml
    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    3b5463f View commit details

  3. [Truffle] TypeSystem has default parameters now.

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    d69ed5c View commit details

  4. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    84c4409 View commit details
Showing with 77 additions and 2,540 deletions.
  1. +0 −7 spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/add.c
  2. +0 −1 spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/add.h
  3. +0 −11 spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/extconf.rb
  4. +0 −8 spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/foo.c
  5. +0 −27 spec/truffle/specs/truffle/cext/inline_spec.rb
  6. +0 −27 spec/truffle/specs/truffle/cext/load_extconf_spec.rb
  7. +0 −31 spec/truffle/specs/truffle/cext/load_files_spec.rb
  8. +0 −31 spec/truffle/specs/truffle/cext/load_string_spec.rb
  9. +0 −17 spec/truffle/specs/truffle/cext/supported_spec.rb
  10. +2 −8 truffle/pom.rb
  11. +5 −21 truffle/pom.xml
  12. +0 −33 truffle/src/main/java/org/jruby/truffle/cext/CExtManager.java
  13. +0 −16 truffle/src/main/java/org/jruby/truffle/cext/CExtSubsystem.java
  14. +1 −1 truffle/src/main/java/org/jruby/truffle/core/HandleLayout.java
  15. +2 −2 truffle/src/main/java/org/jruby/truffle/core/array/ArrayLayout.java
  16. +4 −3 truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectLayout.java
  17. +1 −1 truffle/src/main/java/org/jruby/truffle/core/binding/BindingLayout.java
  18. +2 −2 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterLayout.java
  19. +2 −2 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingLayout.java
  20. +2 −2 truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionLayout.java
  21. +3 −3 truffle/src/main/java/org/jruby/truffle/core/fiber/FiberLayout.java
  22. +2 −2 truffle/src/main/java/org/jruby/truffle/core/hash/HashLayout.java
  23. +2 −2 truffle/src/main/java/org/jruby/truffle/core/klass/ClassLayout.java
  24. +2 −1 truffle/src/main/java/org/jruby/truffle/core/method/MethodLayout.java
  25. +1 −1 truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodLayout.java
  26. +1 −1 truffle/src/main/java/org/jruby/truffle/core/module/ModuleLayout.java
  27. +2 −1 truffle/src/main/java/org/jruby/truffle/core/mutex/MutexLayout.java
  28. +1 −1 truffle/src/main/java/org/jruby/truffle/core/numeric/BignumLayout.java
  29. +2 −2 truffle/src/main/java/org/jruby/truffle/core/proc/ProcLayout.java
  30. +1 −1 truffle/src/main/java/org/jruby/truffle/core/queue/QueueLayout.java
  31. +2 −2 truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueLayout.java
  32. +1 −1 truffle/src/main/java/org/jruby/truffle/core/range/IntegerFixnumRangeLayout.java
  33. +1 −1 truffle/src/main/java/org/jruby/truffle/core/range/LongFixnumRangeLayout.java
  34. +2 −2 truffle/src/main/java/org/jruby/truffle/core/range/ObjectRangeLayout.java
  35. +2 −2 truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataLayout.java
  36. +2 −2 truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpLayout.java
  37. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceLayout.java
  38. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayLayout.java
  39. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/DirLayout.java
  40. +2 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferLayout.java
  41. +2 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOLayout.java
  42. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerLayout.java
  43. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/RandomizerLayout.java
  44. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/WeakRefLayout.java
  45. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringLayout.java
  46. +3 −2 truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolLayout.java
  47. +2 −1 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadBacktraceLocationLayout.java
  48. +3 −3 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadLayout.java
  49. +1 −1 truffle/src/main/java/org/jruby/truffle/core/time/TimeLayout.java
  50. +0 −61 truffle/src/main/java/org/jruby/truffle/extra/TrufflePrimitiveNodes.java
  51. +1 −1 truffle/src/main/java/org/jruby/truffle/language/RubyTypes.java
  52. +0 −215 truffle/src/main/java/org/jruby/truffle/om/dsl/api/Layout.java
  53. +0 −23 truffle/src/main/java/org/jruby/truffle/om/dsl/api/Nullable.java
  54. +0 −18 truffle/src/main/java/org/jruby/truffle/om/dsl/api/UnexpectedLayoutRefusalException.java
  55. +0 −23 truffle/src/main/java/org/jruby/truffle/om/dsl/api/Volatile.java
  56. +0 −71 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/OMProcessor.java
  57. +0 −798 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
  58. +0 −357 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutParser.java
  59. +0 −171 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/LayoutModel.java
  60. +0 −68 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/NameUtils.java
  61. +0 −108 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/PropertyBuilder.java
  62. +0 −121 truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/PropertyModel.java
  63. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/BigDecimalLayout.java
  64. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/DigestLayout.java
  65. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/psych/EmitterLayout.java
  66. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/psych/ParserLayout.java
  67. +0 −111 truffle/src/main/ruby/core/truffle/cext/cext.rb
  68. +0 −43 truffle/src/main/ruby/core/truffle/cext/mkmf.rb
  69. +0 −51 truffle/src/main/ruby/core/truffle/cext/require.rb
7 changes: 0 additions & 7 deletions spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/add.c
View file

This file was deleted.

1 change: 0 additions & 1 deletion spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/add.h
View file

This file was deleted.

11 changes: 0 additions & 11 deletions spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/extconf.rb
View file

This file was deleted.

8 changes: 0 additions & 8 deletions spec/truffle/specs/truffle/cext/fixtures/foo/ext/foo/foo.c
View file

This file was deleted.

27 changes: 0 additions & 27 deletions spec/truffle/specs/truffle/cext/inline_spec.rb
View file

This file was deleted.

27 changes: 0 additions & 27 deletions spec/truffle/specs/truffle/cext/load_extconf_spec.rb
View file

This file was deleted.

31 changes: 0 additions & 31 deletions spec/truffle/specs/truffle/cext/load_files_spec.rb
View file

This file was deleted.

31 changes: 0 additions & 31 deletions spec/truffle/specs/truffle/cext/load_string_spec.rb
View file

This file was deleted.

17 changes: 0 additions & 17 deletions spec/truffle/specs/truffle/cext/supported_spec.rb
View file

This file was deleted.

10 changes: 2 additions & 8 deletions truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
:id => 'truffle' )

truffle_version = '7de96d3ba72f2d1a2a0ef39351a3db4764c74b9c-SNAPSHOT'
truffle_version = '5304979e236e5b9cc743c9c22757eab75cfb7447-SNAPSHOT'
jar 'com.oracle.truffle:truffle-api:' + truffle_version
jar 'com.oracle.truffle:truffle-debug:' + truffle_version
jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'
@@ -37,16 +37,10 @@
'source' => [ '${base.java.version}', '1.7' ],
'target' => [ '${base.javac.version}', '1.7' ],
'useIncrementalCompilation' => 'false' ) do
execute_goals( 'compile',
:id => 'anno',
:phase => 'process-resources',
'includes' => [ 'org/jruby/truffle/om/dsl/processor/OMProcessor.java' ],
'compilerArgs' => [ '-XDignore.symbol.file=true',
'-J-ea' ] )
execute_goals( 'compile',
:id => 'default-compile',
:phase => 'compile',
'annotationProcessors' => [ 'org.jruby.truffle.om.dsl.processor.OMProcessor',
'annotationProcessors' => [ 'com.oracle.truffle.object.dsl.processor.LayoutProcessor',
'com.oracle.truffle.dsl.processor.InstrumentableProcessor',
'com.oracle.truffle.dsl.processor.TruffleProcessor',
'com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor',
26 changes: 5 additions & 21 deletions truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -41,23 +41,23 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-api</artifactId>
<version>7de96d3ba72f2d1a2a0ef39351a3db4764c74b9c-SNAPSHOT</version>
<version>5304979e236e5b9cc743c9c22757eab75cfb7447-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-debug</artifactId>
<version>7de96d3ba72f2d1a2a0ef39351a3db4764c74b9c-SNAPSHOT</version>
<version>5304979e236e5b9cc743c9c22757eab75cfb7447-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-dsl-processor</artifactId>
<version>7de96d3ba72f2d1a2a0ef39351a3db4764c74b9c-SNAPSHOT</version>
<version>5304979e236e5b9cc743c9c22757eab75cfb7447-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-tck</artifactId>
<version>7de96d3ba72f2d1a2a0ef39351a3db4764c74b9c-SNAPSHOT</version>
<version>5304979e236e5b9cc743c9c22757eab75cfb7447-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -99,22 +99,6 @@ DO NOT MODIFIY - GENERATED CODE
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>anno</id>
<phase>process-resources</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<includes>
<include>org/jruby/truffle/om/dsl/processor/OMProcessor.java</include>
</includes>
<compilerArgs>
<compilerArg>-XDignore.symbol.file=true</compilerArg>
<compilerArg>-J-ea</compilerArg>
</compilerArgs>
</configuration>
</execution>
<execution>
<id>default-compile</id>
<phase>compile</phase>
@@ -123,7 +107,7 @@ DO NOT MODIFIY - GENERATED CODE
</goals>
<configuration>
<annotationProcessors>
<annotationProcessor>org.jruby.truffle.om.dsl.processor.OMProcessor</annotationProcessor>
<annotationProcessor>com.oracle.truffle.object.dsl.processor.LayoutProcessor</annotationProcessor>
<annotationProcessor>com.oracle.truffle.dsl.processor.InstrumentableProcessor</annotationProcessor>
<annotationProcessor>com.oracle.truffle.dsl.processor.TruffleProcessor</annotationProcessor>
<annotationProcessor>com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor</annotationProcessor>
33 changes: 0 additions & 33 deletions truffle/src/main/java/org/jruby/truffle/cext/CExtManager.java
View file

This file was deleted.

16 changes: 0 additions & 16 deletions truffle/src/main/java/org/jruby/truffle/cext/CExtSubsystem.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/HandleLayout.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import com.oracle.truffle.api.object.dsl.Layout;

@Layout
public interface HandleLayout extends BasicObjectLayout {
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/array/ArrayLayout.java
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.object.ObjectType;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import com.oracle.truffle.api.object.dsl.Layout;
import com.oracle.truffle.api.object.dsl.Nullable;

@Layout
public interface ArrayLayout extends BasicObjectLayout {
7 changes: 4 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectLayout.java
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,11 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.object.ObjectType;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import com.oracle.truffle.api.object.dsl.Layout;
import com.oracle.truffle.api.object.dsl.Nullable;
import org.jruby.truffle.language.RubyObjectType;

@Layout(objectTypeSuperclass = "org.jruby.truffle.language.RubyObjectType")
@Layout(objectTypeSuperclass = RubyObjectType.class, implicitCastIntToLong = true)
public interface BasicObjectLayout {

DynamicObjectFactory createBasicObjectShape(@Nullable DynamicObject logicalClass,
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/binding/BindingLayout.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import com.oracle.truffle.api.object.dsl.Layout;

@Layout
public interface BindingLayout extends BasicObjectLayout {
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterLayout.java
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jcodings.transcode.EConv;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import com.oracle.truffle.api.object.dsl.Layout;
import com.oracle.truffle.api.object.dsl.Nullable;

@Layout
public interface EncodingConverterLayout extends BasicObjectLayout {
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingLayout.java
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jcodings.Encoding;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import com.oracle.truffle.api.object.dsl.Layout;
import com.oracle.truffle.api.object.dsl.Nullable;
import org.jruby.util.ByteList;

@Layout
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionLayout.java
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.language.backtrace.Backtrace;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import com.oracle.truffle.api.object.dsl.Layout;
import com.oracle.truffle.api.object.dsl.Nullable;

@Layout
public interface ExceptionLayout extends BasicObjectLayout {
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/fiber/FiberLayout.java
View file
Original file line number Diff line number Diff line change
@@ -12,9 +12,9 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import org.jruby.truffle.om.dsl.api.Volatile;
import com.oracle.truffle.api.object.dsl.Layout;
import com.oracle.truffle.api.object.dsl.Nullable;
import com.oracle.truffle.api.object.dsl.Volatile;

import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
Loading