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

Commits on Mar 25, 2015

  1. [Truffle] Remove a null check by moving some initialization code.

    @eregon
    eregon committed Mar 25, 2015
    Copy the full SHA
    577ffbc View commit details

  2. [Truffle] Remove never taken null check.

    @eregon
    eregon committed Mar 25, 2015
    Copy the full SHA
    d507e49 View commit details
7 changes: 3 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -172,10 +172,6 @@ public CoreLibrary(RubyContext context) {
objectClass.getAdoptedByLexicalParent(objectClass, "Object", null);
moduleClass.getAdoptedByLexicalParent(objectClass, "Module", null);

// BasicObject knows itself

basicObjectClass.setConstant(null, "BasicObject", basicObjectClass);

// Create Exception classes

// Exception
@@ -391,6 +387,9 @@ private void initializeConstants() {
objectClass.setConstant(null, "RUBY_RELEASE_DATE", RubyString.fromJavaString(stringClass, Constants.COMPILE_DATE));
objectClass.setConstant(null, "RUBY_DESCRIPTION", RubyString.fromJavaString(stringClass, OutputStrings.getVersionString()));

// BasicObject knows itself
basicObjectClass.setConstant(null, "BasicObject", basicObjectClass);

// TODO(cs): this should be a separate exception
mathModule.setConstant(null, "DomainError", edomClass);

4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
View file
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ public void include(Node currentNode, RubyModule module) {
*/
@TruffleBoundary
public void setConstant(Node currentNode, String name, Object value) {
if (getContext().getCoreLibrary() != null && getContext().getCoreLibrary().isLoadingCoreLibrary()) {
if (getContext().getCoreLibrary().isLoadingCoreLibrary()) {
final RubyConstant currentConstant = constants.get(name);

if (currentConstant != null) {
@@ -269,7 +269,7 @@ public void addMethod(Node currentNode, InternalMethod method) {

assert method != null;

if (getContext().getCoreLibrary() != null && getContext().getCoreLibrary().isLoadingCoreLibrary()) {
if (getContext().getCoreLibrary().isLoadingCoreLibrary()) {
final InternalMethod currentMethod = methods.get(method.getName());

if (currentMethod != null && currentMethod.getSharedMethodInfo().getSourceSection() instanceof CoreSourceSection) {