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

Commits on Apr 24, 2015

  1. [Truffle] remove misplaced assertion

    Matthias Grimmer committed Apr 24, 2015
    Copy the full SHA
    c4e00b1 View commit details

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

    @chrisseaton
    chrisseaton committed Apr 24, 2015
    Copy the full SHA
    1c56b3a View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/UninitializedWriteObjectFieldNode.java
4 changes: 3 additions & 1 deletion ...rc/main/java/org/jruby/truffle/nodes/objectstorage/UninitializedWriteObjectFieldNode.java
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,9 @@ public void execute(RubyBasicObject object, Object value) {
}

location = newProperty.getLocation();
assert location.canSet(object.getDynamicObject(), value);

// MG: is this assertion misplaced?
// assert location.canSet(object.getDynamicObject(), value);

final WriteObjectFieldChainNode writeNode;