[Truffle] Fix merge.

jruby · Dec 12, 2014 · 4cc6aff · 4cc6aff
1 parent 78db904
commit 4cc6aff
Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
@@ -3079,7 +3079,7 @@ public Object selectObject(VirtualFrame frame, RubyArray array, RubyProc block)
                 }
             } finally {
                 if (CompilerDirectives.inInterpreter()) {
-                    ((RubyRootNode) getRootNode()).reportLoopCountThroughBlocks(count);
+                    ((RubyRootNode) getRootNode()).reportLoopCount(count);
                 }
             }
 
@@ -3112,7 +3112,7 @@ public Object selectFixnumInteger(VirtualFrame frame, RubyArray array, RubyProc
                 }
             } finally {
                 if (CompilerDirectives.inInterpreter()) {
-                    ((RubyRootNode) getRootNode()).reportLoopCountThroughBlocks(count);
+                    ((RubyRootNode) getRootNode()).reportLoopCount(count);
                 }
             }
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordArgumentNode.java b/core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordArgumentNode.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.RubyValueProfile;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.UndefinedPlaceholder;