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: 7beb1f145466
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 432e895171c0
Choose a head ref
  • 8 commits
  • 249 files changed
  • 1 contributor

Commits on May 5, 2016

  1. Copy the full SHA
    ce63fc6 View commit details
  2. Copy the full SHA
    2a10ed2 View commit details
  3. Copy the full SHA
    d18ae3f View commit details
  4. Copy the full SHA
    b6a4b88 View commit details
  5. [Truffle] Remove the word Rubinius from our primitive infrastructure.

    We'll now just see them as a alternative to the core method infrastructure.
    chrisseaton committed May 5, 2016
    Copy the full SHA
    6d6fc5c View commit details

Commits on May 6, 2016

  1. Copy the full SHA
    2cfa314 View commit details
  2. Copy the full SHA
    8e4852b View commit details
  3. Copy the full SHA
    432e895 View commit details
Showing with 3,738 additions and 4,023 deletions.
  1. +5 −3 truffle/src/main/java/org/jruby/truffle/{core → }/Layouts.java
  2. +5 −5 truffle/src/main/java/org/jruby/truffle/RubyContext.java
  3. +4 −4 ...rg/jruby/truffle/{core/rubinius/CallRubiniusPrimitiveNode.java → builtins/CallPrimitiveNode.java}
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/builtins/CoreClass.java
  5. +4 −5 truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNodeManager.java
  6. +1 −1 truffle/src/main/java/org/jruby/truffle/{core/rubinius → builtins}/InvokeRubiniusPrimitiveNode.java
  7. +1 −4 truffle/src/main/java/org/jruby/truffle/builtins/{RubiniusOnly.java → NonStandard.java}
  8. +2 −2 .../src/main/java/org/jruby/truffle/{core/rubinius/RubiniusPrimitive.java → builtins/Primitive.java}
  9. +5 −4 ...re/rubinius/RubiniusPrimitiveArrayArgumentsNode.java → builtins/PrimitiveArrayArgumentsNode.java}
  10. +5 −5 ...le/{core/rubinius/RubiniusPrimitiveCallConstructor.java → builtins/PrimitiveCallConstructor.java}
  11. +2 −2 ...by/truffle/{core/rubinius/RubiniusPrimitiveConstructor.java → builtins/PrimitiveConstructor.java}
  12. +109 −0 truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveManager.java
  13. +4 −4 ...n/java/org/jruby/truffle/{core/rubinius/RubiniusPrimitiveNode.java → builtins/PrimitiveNode.java}
  14. +9 −11 ...le/{core/rubinius/RubiniusPrimitiveNodeConstructor.java → builtins/PrimitiveNodeConstructor.java}
  15. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/UnsafeNode.java
  16. +1 −0 truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
  17. +1 −1 truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
  18. +2 −1 truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
  19. +14 −12 truffle/src/main/java/org/jruby/truffle/core/{rubinius/ObjectPrimitiveNodes.java → ObjectNodes.java}
  20. +2 −1 truffle/src/main/java/org/jruby/truffle/core/ProcessNodes.java
  21. +1 −0 truffle/src/main/java/org/jruby/truffle/core/SetTopLevelBindingNode.java
  22. +1 −1 truffle/src/main/java/org/jruby/truffle/core/TruffleGCNodes.java
  23. +2 −1 truffle/src/main/java/org/jruby/truffle/core/TruffleProcessNodes.java
  24. +1 −1 truffle/src/main/java/org/jruby/truffle/core/TruffleSystemNodes.java
  25. +1 −1 truffle/src/main/java/org/jruby/truffle/core/adapaters/OutputStreamAdapter.java
  26. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java
  27. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java
  28. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java
  29. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java
  30. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayDropTailNode.java
  31. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayDupNode.java
  32. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java
  33. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayGeneralizeNode.java
  34. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayGetTailNode.java
  35. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayGuards.java
  36. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayHelpers.java
  37. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java
  38. +14 −2 truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
  39. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayOperations.java
  40. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayPopOneNode.java
  41. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java
  42. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadNormalizedNode.java
  43. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java
  44. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceNormalizedNode.java
  45. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArraySliceNode.java
  46. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayStrategy.java
  47. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayWriteNormalizedNode.java
  48. +3 −3 truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectNodes.java
  49. +2 −2 truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java
  50. +1 −1 truffle/src/main/java/org/jruby/truffle/core/binding/TruffleBindingNodes.java
  51. +1 −1 truffle/src/main/java/org/jruby/truffle/core/bool/FalseClassNodes.java
  52. +1 −1 truffle/src/main/java/org/jruby/truffle/core/bool/TrueClassNodes.java
  53. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/ArrayCastNode.java
  54. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/CmpIntNode.java
  55. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/NameToJavaStringNode.java
  56. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/NameToSymbolOrStringNode.java
  57. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/SingleValueCastNode.java
  58. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/SplatCastNode.java
  59. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/StringToSymbolNode.java
  60. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/ToAryNode.java
  61. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java
  62. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/ToIntNode.java
  63. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/ToProcNode.java
  64. +1 −1 truffle/src/main/java/org/jruby/truffle/core/cast/ToStrNode.java
  65. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{rubinius → dir}/DirLayout.java
  66. +15 −13 truffle/src/main/java/org/jruby/truffle/core/{rubinius/DirPrimitiveNodes.java → dir/DirNodes.java}
  67. +272 −5 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterNodes.java
  68. +41 −6 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java
  69. +1 −1 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingOperations.java
  70. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java
  71. +17 −4 truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java
  72. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionOperations.java
  73. +1 −1 truffle/src/main/java/org/jruby/truffle/core/fiber/FiberManager.java
  74. +2 −2 truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java
  75. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/convert/ToLongNode.java
  76. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java
  77. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java
  78. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java
  79. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBinaryStringNode.java
  80. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBitStringNode.java
  81. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java
  82. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java
  83. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java
  84. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBERNode.java
  85. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/BucketsStrategy.java
  86. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/HashGuards.java
  87. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java
  88. +6 −6 truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java
  89. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/HashOperations.java
  90. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java
  91. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/PackedArrayStrategy.java
  92. +1 −1 truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java
  93. +1 −1 truffle/src/main/java/org/jruby/truffle/core/kernel/AtExitManager.java
  94. +6 −6 truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
  95. +1 −1 truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java
  96. +1 −1 truffle/src/main/java/org/jruby/truffle/core/kernel/TruffleKernelNodes.java
  97. +2 −2 truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java
  98. +2 −2 truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java
  99. +2 −2 truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java
  100. +1 −1 truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java
  101. +2 −2 truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
  102. +1 −1 truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java
  103. +2 −2 truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java
  104. +1 −1 truffle/src/main/java/org/jruby/truffle/core/mutex/MutexOperations.java
  105. +71 −2 truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java
  106. +1 −1 truffle/src/main/java/org/jruby/truffle/core/numeric/BignumOperations.java
  107. +161 −2 truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java
  108. +116 −2 truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java
  109. +1 −1 truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java
  110. +2 −2 truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java
  111. +1 −1 truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java
  112. +2 −2 truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceNodes.java
  113. +2 −2 truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java
  114. +1 −1 truffle/src/main/java/org/jruby/truffle/core/proc/ProcOperations.java
  115. +1 −1 truffle/src/main/java/org/jruby/truffle/core/proc/ProcSignalHandler.java
  116. +4 −4 truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java
  117. +2 −2 truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueNodes.java
  118. +6 −6 truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java
  119. +1 −1 truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java
  120. +5 −5 truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java
  121. +1 −1 truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpGuards.java
  122. +6 −6 truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java
  123. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java
  124. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rope/TruffleRopesNodes.java
  125. +0 −26 truffle/src/main/java/org/jruby/truffle/core/rubinius/ArrayPrimitiveNodes.java
  126. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java
  127. +0 −92 truffle/src/main/java/org/jruby/truffle/core/rubinius/BignumPrimitiveNodes.java
  128. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java
  129. +5 −3 truffle/src/main/java/org/jruby/truffle/core/rubinius/ChannelPrimitiveNodes.java
  130. +0 −297 truffle/src/main/java/org/jruby/truffle/core/rubinius/EncodingConverterPrimitiveNodes.java
  131. +0 −53 truffle/src/main/java/org/jruby/truffle/core/rubinius/EncodingPrimitiveNodes.java
  132. +0 −30 truffle/src/main/java/org/jruby/truffle/core/rubinius/ExceptionPrimitiveNodes.java
  133. +0 −181 truffle/src/main/java/org/jruby/truffle/core/rubinius/FixnumPrimitiveNodes.java
  134. +0 −139 truffle/src/main/java/org/jruby/truffle/core/rubinius/FloatPrimitiveNodes.java
  135. +9 −7 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java
  136. +38 −36 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
  137. +4 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/NativeFunctionPrimitiveNodes.java
  138. +33 −31 truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerPrimitiveNodes.java
  139. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/PosixNodes.java
  140. +13 −11 truffle/src/main/java/org/jruby/truffle/core/rubinius/RandomizerPrimitiveNodes.java
  141. +17 −15 truffle/src/main/java/org/jruby/truffle/core/rubinius/RegexpPrimitiveNodes.java
  142. +0 −83 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusPrimitiveManager.java
  143. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java
  144. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusTypeNodes.java
  145. +37 −35 truffle/src/main/java/org/jruby/truffle/core/rubinius/StatPrimitiveNodes.java
  146. +0 −1,862 truffle/src/main/java/org/jruby/truffle/core/rubinius/StringPrimitiveNodes.java
  147. +0 −33 truffle/src/main/java/org/jruby/truffle/core/rubinius/SymbolPrimitiveNodes.java
  148. +0 −103 truffle/src/main/java/org/jruby/truffle/core/rubinius/ThreadPrimitiveNodes.java
  149. +0 −537 truffle/src/main/java/org/jruby/truffle/core/rubinius/TimePrimitiveNodes.java
  150. +4 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/UndefinedPrimitiveNodes.java
  151. +47 −45 truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java
  152. +9 −7 truffle/src/main/java/org/jruby/truffle/core/rubinius/WeakRefPrimitiveNodes.java
  153. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java
  154. +2 −4 truffle/src/main/java/org/jruby/truffle/core/string/InterpolatedStringNode.java
  155. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringGuards.java
  156. +1,805 −17 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
  157. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java
  158. +16 −2 truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java
  159. +1 −1 truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolTable.java
  160. +1 −1 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadBacktraceLocationNodes.java
  161. +2 −3 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadManager.java
  162. +82 −4 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java
  163. +475 −5 truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java
  164. +1 −1 truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointEventNode.java
  165. +2 −2 truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java
  166. +2 −2 truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java
  167. +2 −2 truffle/src/main/java/org/jruby/truffle/extra/AttachmentsInternalNodes.java
  168. +1 −1 truffle/src/main/java/org/jruby/truffle/extra/AttachmentsManager.java
  169. +1 −1 truffle/src/main/java/org/jruby/truffle/extra/TruffleGraalNodes.java
  170. +1 −1 truffle/src/main/java/org/jruby/truffle/interop/CExtNodes.java
  171. +1 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteHelperNode.java
  172. +1 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignReadStringCachingHelperNode.java
  173. +2 −2 truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java
  174. +1 −1 truffle/src/main/java/org/jruby/truffle/interop/RubyMessageResolution.java
  175. +1 −1 truffle/src/main/java/org/jruby/truffle/interop/ToJavaStringNode.java
  176. +1 −1 truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java
  177. +1 −1 truffle/src/main/java/org/jruby/truffle/language/DataNode.java
  178. +1 −1 truffle/src/main/java/org/jruby/truffle/language/LexicalScope.java
  179. +1 −1 truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java
  180. +1 −1 truffle/src/main/java/org/jruby/truffle/language/RubyConstant.java
  181. +1 −1 truffle/src/main/java/org/jruby/truffle/language/RubyGuards.java
  182. +1 −1 truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java
  183. +1 −1 truffle/src/main/java/org/jruby/truffle/language/SafepointManager.java
  184. +3 −3 truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java
  185. +1 −1 truffle/src/main/java/org/jruby/truffle/language/TruffleSafeNodes.java
  186. +1 −1 truffle/src/main/java/org/jruby/truffle/language/arguments/ArgumentDescriptorUtils.java
  187. +1 −1 truffle/src/main/java/org/jruby/truffle/language/arguments/ArrayIsAtLeastAsLargeAsNode.java
  188. +1 −1 truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordRestArgumentNode.java
  189. +1 −1 truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java
  190. +1 −1 truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java
  191. +1 −1 truffle/src/main/java/org/jruby/truffle/language/arguments/RunBlockKWArgsHelperNode.java
  192. +1 −1 truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java
  193. +1 −1 truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java
  194. +1 −1 truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java
  195. +1 −1 truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantWithLexicalScopeNode.java
  196. +1 −1 truffle/src/main/java/org/jruby/truffle/language/constants/ReadConstantWithLexicalScopeNode.java
  197. +1 −1 truffle/src/main/java/org/jruby/truffle/language/constants/ReadLiteralConstantNode.java
  198. +1 −1 truffle/src/main/java/org/jruby/truffle/language/constants/WriteConstantNode.java
  199. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedDispatchNode.java
  200. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedSymbolDispatchNode.java
  201. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedMethodMissingDispatchNode.java
  202. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedReturnMissingDispatchNode.java
  203. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedSingletonDispatchNode.java
  204. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/RubyCallNode.java
  205. +1 −1 truffle/src/main/java/org/jruby/truffle/language/dispatch/UnresolvedDispatchNode.java
  206. +1 −1 truffle/src/main/java/org/jruby/truffle/language/exceptions/TopLevelRaiseHandler.java
  207. +1 −1 truffle/src/main/java/org/jruby/truffle/language/globals/ReadMatchReferenceNode.java
  208. +1 −1 truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
  209. +1 −1 truffle/src/main/java/org/jruby/truffle/language/methods/AddMethodNode.java
  210. +1 −1 truffle/src/main/java/org/jruby/truffle/language/methods/CallBoundMethodNode.java
  211. +1 −1 truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java
  212. +1 −1 truffle/src/main/java/org/jruby/truffle/language/methods/InternalMethod.java
  213. +1 −1 truffle/src/main/java/org/jruby/truffle/language/methods/LookupMethodNode.java
  214. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java
  215. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java
  216. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/DefineModuleNode.java
  217. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/FreezeNode.java
  218. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java
  219. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/IsFrozenNode.java
  220. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java
  221. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/LogicalClassNode.java
  222. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/MetaClassNode.java
  223. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/ObjectGraph.java
  224. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java
  225. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/RunModuleDefinitionNode.java
  226. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/ShapeCachingGuards.java
  227. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java
  228. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java
  229. +5 −5 truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java
  230. +1 −1 truffle/src/main/java/org/jruby/truffle/language/supercall/LookupSuperMethodNode.java
  231. +1 −1 truffle/src/main/java/org/jruby/truffle/language/threadlocal/ThreadLocalObjectNode.java
  232. +1 −1 truffle/src/main/java/org/jruby/truffle/language/yield/CallBlockNode.java
  233. +1 −1 truffle/src/main/java/org/jruby/truffle/language/yield/YieldNode.java
  234. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/CoverageNodes.java
  235. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/EtcNodes.java
  236. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java
  237. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/AbstractAddNode.java
  238. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/AbstractDivNode.java
  239. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/AbstractMultNode.java
  240. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/AbstractSubNode.java
  241. +1 −3 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCastNode.java
  242. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodNode.java
  243. +4 −4 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java
  244. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/CreateBigDecimalNode.java
  245. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/digest/DigestNodes.java
  246. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java
  247. +2 −2 truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychParserNodes.java
  248. +1 −1 truffle/src/main/java/org/jruby/truffle/tools/InstrumentationServerManager.java
  249. +1 −1 truffle/src/main/java/org/jruby/truffle/tools/simpleshell/SimpleShell.java
Original file line number Diff line number Diff line change
@@ -7,15 +7,18 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle;

import com.oracle.truffle.api.object.HiddenKey;
import org.jruby.truffle.core.HandleLayout;
import org.jruby.truffle.core.HandleLayoutImpl;
import org.jruby.truffle.core.array.ArrayLayout;
import org.jruby.truffle.core.array.ArrayLayoutImpl;
import org.jruby.truffle.core.basicobject.BasicObjectLayout;
import org.jruby.truffle.core.basicobject.BasicObjectLayoutImpl;
import org.jruby.truffle.core.binding.BindingLayout;
import org.jruby.truffle.core.binding.BindingLayoutImpl;
import org.jruby.truffle.core.dir.DirLayoutImpl;
import org.jruby.truffle.core.encoding.EncodingConverterLayout;
import org.jruby.truffle.core.encoding.EncodingConverterLayoutImpl;
import org.jruby.truffle.core.encoding.EncodingLayout;
@@ -58,8 +61,7 @@
import org.jruby.truffle.core.rubinius.AtomicReferenceLayoutImpl;
import org.jruby.truffle.core.rubinius.ByteArrayLayout;
import org.jruby.truffle.core.rubinius.ByteArrayLayoutImpl;
import org.jruby.truffle.core.rubinius.DirLayout;
import org.jruby.truffle.core.rubinius.DirLayoutImpl;
import org.jruby.truffle.core.dir.DirLayout;
import org.jruby.truffle.core.rubinius.IOBufferLayout;
import org.jruby.truffle.core.rubinius.IOBufferLayoutImpl;
import org.jruby.truffle.core.rubinius.IOLayout;
10 changes: 5 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/RubyContext.java
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
import org.jruby.truffle.core.module.ModuleOperations;
import org.jruby.truffle.core.objectspace.ObjectSpaceManager;
import org.jruby.truffle.core.rope.RopeTable;
import org.jruby.truffle.core.rubinius.RubiniusPrimitiveManager;
import org.jruby.truffle.builtins.PrimitiveManager;
import org.jruby.truffle.core.string.CoreStrings;
import org.jruby.truffle.core.string.FrozenStrings;
import org.jruby.truffle.core.symbol.SymbolTable;
@@ -65,7 +65,7 @@ public class RubyContext extends ExecutionContext {

private final Options options = new Options();
private final RopeTable ropeTable = new RopeTable();
private final RubiniusPrimitiveManager rubiniusPrimitiveManager = new RubiniusPrimitiveManager();
private final PrimitiveManager primitiveManager = new PrimitiveManager();
private final JRubyInterop jrubyInterop = new JRubyInterop(this);
private final SafepointManager safepointManager = new SafepointManager(this);
private final SymbolTable symbolTable = new SymbolTable(this);
@@ -150,7 +150,7 @@ public RubyContext(Ruby jrubyRuntime, TruffleLanguage.Env env) {

org.jruby.Main.printTruffleTimeMetric("before-load-nodes");
coreLibrary.addCoreMethods();
rubiniusPrimitiveManager.addAnnotatedPrimitives();
primitiveManager.addAnnotatedPrimitives();
org.jruby.Main.printTruffleTimeMetric("after-load-nodes");

// Load the reset of the core library
@@ -291,8 +291,8 @@ public CompilerOptions getCompilerOptions() {
return compilerOptions;
}

public RubiniusPrimitiveManager getRubiniusPrimitiveManager() {
return rubiniusPrimitiveManager;
public PrimitiveManager getPrimitiveManager() {
return primitiveManager;
}

public CoverageManager getCoverageManager() {
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.builtins;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -18,17 +18,17 @@
import org.jruby.truffle.language.control.ReturnID;

/**
* Node which wraps a {@link RubiniusPrimitiveNode}, providing the implicit control flow that you get with calls to
* Node which wraps a {@link PrimitiveNode}, providing the implicit control flow that you get with calls to
* Rubinius primitives.
*/
public class CallRubiniusPrimitiveNode extends RubyNode {
public class CallPrimitiveNode extends RubyNode {

@Child private RubyNode primitive;
private final ReturnID returnID;

private final ConditionProfile primitiveSucceededCondition = ConditionProfile.createBinaryProfile();

public CallRubiniusPrimitiveNode(RubyContext context, SourceSection sourceSection, RubyNode primitive, ReturnID returnID) {
public CallPrimitiveNode(RubyContext context, SourceSection sourceSection, RubyNode primitive, ReturnID returnID) {
super(context, sourceSection);
this.primitive = primitive;
this.returnID = returnID;
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface CoreClass {

String name();
String value();

}
Original file line number Diff line number Diff line change
@@ -18,10 +18,9 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.Layouts;
import org.jruby.truffle.core.RaiseIfFrozenNode;
import org.jruby.truffle.core.ReturnEnumeratorIfNoBlockNode;
import org.jruby.truffle.core.UnsafeNode;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.core.cast.TaintResultNode;
import org.jruby.truffle.core.module.ModuleOperations;
@@ -81,7 +80,7 @@ private DynamicObject getSingletonClass(Object object) {

private void addCoreMethod(MethodDetails methodDetails) {
DynamicObject module;
String fullName = methodDetails.getClassAnnotation().name();
String fullName = methodDetails.getClassAnnotation().value();

if (fullName.equals("main")) {
module = getSingletonClass(context.getCoreLibrary().getMainObject());
@@ -158,7 +157,7 @@ private static void addMethod(RubyContext context, DynamicObject module, RubyRoo
private static RubyRootNode makeGenericMethod(RubyContext context, MethodDetails methodDetails) {
final CoreMethod method = methodDetails.getMethodAnnotation();

final SourceSection sourceSection = CoreSourceSection.createCoreSourceSection(methodDetails.getClassAnnotation().name(), method.names()[0]);
final SourceSection sourceSection = CoreSourceSection.createCoreSourceSection(methodDetails.getClassAnnotation().value(), method.names()[0]);

final int required = method.required();
final int optional = method.optional();
@@ -352,7 +351,7 @@ public NodeFactory<? extends RubyNode> getNodeFactory() {
}

public String getIndicativeName() {
return classAnnotation.name() + "#" + methodAnnotation.names()[0];
return classAnnotation.value() + "#" + methodAnnotation.names()[0];
}
}

Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.builtins;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.profiles.ConditionProfile;
Original file line number Diff line number Diff line change
@@ -14,10 +14,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* A method that only exists in Rubinius but not in normal Ruby.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.SOURCE)
public @interface RubiniusOnly {
public @interface NonStandard {
}
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.builtins;

import org.jruby.truffle.platform.UnsafeGroup;

@@ -18,7 +18,7 @@

@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface RubiniusPrimitive {
public @interface Primitive {

String name();

Original file line number Diff line number Diff line change
@@ -7,22 +7,23 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.builtins;

import com.oracle.truffle.api.dsl.GenerateNodeFactory;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.builtins.PrimitiveNode;
import org.jruby.truffle.language.RubyNode;

@GenerateNodeFactory
@NodeChild(value = "arguments", type = RubyNode[].class)
public abstract class RubiniusPrimitiveArrayArgumentsNode extends RubiniusPrimitiveNode {
public abstract class PrimitiveArrayArgumentsNode extends PrimitiveNode {

public RubiniusPrimitiveArrayArgumentsNode() {
public PrimitiveArrayArgumentsNode() {
}

public RubiniusPrimitiveArrayArgumentsNode(RubyContext context, SourceSection sourceSection) {
public PrimitiveArrayArgumentsNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.builtins;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.Layouts;
import org.jruby.truffle.core.method.MethodNodesFactory;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.RubyGuards;
@@ -23,11 +23,11 @@
import org.jruby.truffle.language.control.ReturnID;
import org.jruby.truffle.language.literal.ObjectLiteralNode;

public class RubiniusPrimitiveCallConstructor implements RubiniusPrimitiveConstructor {
public class PrimitiveCallConstructor implements PrimitiveConstructor {

private final DynamicObject method;

public RubiniusPrimitiveCallConstructor(DynamicObject method) {
public PrimitiveCallConstructor(DynamicObject method) {
assert RubyGuards.isRubyMethod(method);
this.method = method;
}
@@ -39,7 +39,7 @@ public int getPrimitiveArity() {

@Override
public RubyNode createCallPrimitiveNode(RubyContext context, SourceSection sourceSection, ReturnID returnID) {
return new CallRubiniusPrimitiveNode(context, sourceSection,
return new CallPrimitiveNode(context, sourceSection,
MethodNodesFactory.CallNodeFactory.create(context, sourceSection, new RubyNode[] {
new ObjectLiteralNode(context, sourceSection, method),
new ReadAllArgumentsNode(),
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core.rubinius;
package org.jruby.truffle.builtins;

import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.control.ReturnID;

public interface RubiniusPrimitiveConstructor {
public interface PrimitiveConstructor {
public int getPrimitiveArity();

public RubyNode createCallPrimitiveNode(RubyContext context, SourceSection sourceSection, ReturnID returnID);
109 changes: 109 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveManager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/*
* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.builtins;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.GeneratedBy;
import com.oracle.truffle.api.dsl.NodeFactory;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.ObjectNodesFactory;
import org.jruby.truffle.core.array.ArrayNodesFactory;
import org.jruby.truffle.core.dir.DirNodesFactory;
import org.jruby.truffle.core.encoding.EncodingConverterNodesFactory;
import org.jruby.truffle.core.encoding.EncodingNodesFactory;
import org.jruby.truffle.core.exception.ExceptionNodesFactory;
import org.jruby.truffle.core.numeric.BignumNodesFactory;
import org.jruby.truffle.core.numeric.FixnumNodesFactory;
import org.jruby.truffle.core.numeric.FloatNodesFactory;
import org.jruby.truffle.core.rubinius.IOBufferPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.IOPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.NativeFunctionPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.PointerPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.RandomizerPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.RegexpPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.StatPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.UndefinedPrimitiveNodes;
import org.jruby.truffle.core.rubinius.UndefinedPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.VMPrimitiveNodesFactory;
import org.jruby.truffle.core.rubinius.WeakRefPrimitiveNodesFactory;
import org.jruby.truffle.core.string.StringNodesFactory;
import org.jruby.truffle.core.symbol.SymbolNodesFactory;
import org.jruby.truffle.core.thread.ThreadNodesFactory;
import org.jruby.truffle.core.time.TimeNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

/**
* Manages the available Rubinius primitive calls.
*/
public class PrimitiveManager {

private final ConcurrentMap<String, PrimitiveConstructor> primitives = new ConcurrentHashMap<String, PrimitiveConstructor>();

public PrimitiveConstructor getPrimitive(String name) {
final PrimitiveConstructor constructor = primitives.get(name);

if (constructor == null) {
return primitives.get(UndefinedPrimitiveNodes.NAME);
}

return constructor;
}

public void addAnnotatedPrimitives() {
final List<NodeFactory<? extends RubyNode>> nodeFactories = new ArrayList<>();

nodeFactories.addAll(VMPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(ObjectNodesFactory.getFactories());
nodeFactories.addAll(TimeNodesFactory.getFactories());
nodeFactories.addAll(StringNodesFactory.getFactories());
nodeFactories.addAll(SymbolNodesFactory.getFactories());
nodeFactories.addAll(FixnumNodesFactory.getFactories());
nodeFactories.addAll(BignumNodesFactory.getFactories());
nodeFactories.addAll(FloatNodesFactory.getFactories());
nodeFactories.addAll(EncodingNodesFactory.getFactories());
nodeFactories.addAll(EncodingConverterNodesFactory.getFactories());
nodeFactories.addAll(RegexpPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(RandomizerPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(ArrayNodesFactory.getFactories());
nodeFactories.addAll(StatPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(PointerPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(NativeFunctionPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(DirNodesFactory.getFactories());
nodeFactories.addAll(IOPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(IOBufferPrimitiveNodesFactory.getFactories());
nodeFactories.addAll(ExceptionNodesFactory.getFactories());
nodeFactories.addAll(ThreadNodesFactory.getFactories());
nodeFactories.addAll(WeakRefPrimitiveNodesFactory.getFactories());

// This comes last as a catch-all
nodeFactories.addAll(UndefinedPrimitiveNodesFactory.getFactories());

for (NodeFactory<? extends RubyNode> nodeFactory : nodeFactories) {
final GeneratedBy generatedBy = nodeFactory.getClass().getAnnotation(GeneratedBy.class);
final Class<?> nodeClass = generatedBy.value();
final Primitive annotation = nodeClass.getAnnotation(Primitive.class);
if (annotation != null) {
primitives.putIfAbsent(annotation.name(), new PrimitiveNodeConstructor(annotation, nodeFactory));
}
}
}

@TruffleBoundary
public void installPrimitive(String name, DynamicObject method) {
assert RubyGuards.isRubyMethod(method);
primitives.put(name, new PrimitiveCallConstructor(method));
}
}
Loading