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

Commits on Dec 15, 2017

  1. Start pushing more detail about frames into binding logic.

    @headius
    headius committed Dec 15, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1c94b5e View commit details

  2. Track what fields a given method name reads and writes.

    @headius
    headius committed Dec 15, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56371cc View commit details

  3. Pack method names to reduce boot binding bytecode.

    @headius
    headius committed Dec 15, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    29aa077 View commit details

  4. Clean up imports.

    @headius
    headius committed Dec 15, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    daaa4fd View commit details

Commits on Dec 19, 2017

  1. Split frame flags into individual fields.

    @headius
    headius committed Dec 19, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea8825d View commit details
Showing with 514 additions and 189 deletions.
  1. +15 −8 core/src/main/java/org/jruby/Ruby.java
  2. +10 −10 core/src/main/java/org/jruby/RubyBasicObject.java
  3. +4 −4 core/src/main/java/org/jruby/RubyKernel.java
  4. +18 −19 core/src/main/java/org/jruby/RubyModule.java
  5. +95 −33 core/src/main/java/org/jruby/anno/AnnotationBinder.java
  6. +37 −8 core/src/main/java/org/jruby/anno/AnnotationHelper.java
  7. +54 −2 core/src/main/java/org/jruby/anno/FrameField.java
  8. +108 −50 core/src/main/java/org/jruby/anno/IndyBinder.java
  9. +26 −3 core/src/main/java/org/jruby/ir/IRFlags.java
  10. +20 −8 core/src/main/java/org/jruby/ir/IRScope.java
  11. +0 −16 core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java
  12. +1 −1 core/src/main/java/org/jruby/ir/instructions/BuildBackrefInstr.java
  13. +72 −14 core/src/main/java/org/jruby/ir/instructions/CallBase.java
  14. +5 −3 core/src/main/java/org/jruby/ir/instructions/GetGlobalVariableInstr.java
  15. +2 −2 core/src/main/java/org/jruby/ir/instructions/LoadFrameClosureInstr.java
  16. +2 −2 core/src/main/java/org/jruby/ir/instructions/MatchInstr.java
  17. +6 −2 core/src/main/java/org/jruby/ir/instructions/PutGlobalVarInstr.java
  18. +2 −2 core/src/main/java/org/jruby/ir/instructions/RuntimeHelperCall.java
  19. +2 −1 core/src/main/java/org/jruby/ir/instructions/UnresolvedSuperInstr.java
  20. +1 −1 core/src/main/java/org/jruby/ir/operands/Symbol.java
  21. +3 −0 core/src/main/java/org/jruby/runtime/Helpers.java
  22. +31 −0 core/src/main/java/org/jruby/runtime/MethodIndex.java
23 changes: 15 additions & 8 deletions core/src/main/java/org/jruby/Ruby.java
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,6 @@
import org.jruby.parser.StaticScope;
import org.jruby.runtime.JavaSites;
import org.jruby.runtime.invokedynamic.InvokeDynamicSupport;
import org.jruby.runtime.opto.ConstantInvalidator;
import org.jruby.util.MRIRecursionGuard;
import org.jruby.util.StrptimeParser;
import org.jruby.util.StrptimeToken;
@@ -176,13 +175,10 @@
import java.lang.invoke.MethodHandle;
import java.lang.ref.WeakReference;
import java.net.BindException;
import java.net.PortUnreachableException;
import java.nio.channels.ClosedChannelException;
import java.nio.charset.Charset;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.HashMap;
@@ -3004,13 +3000,24 @@ public void loadExtension(String extName, BasicLibraryService extension, boolean

public void addBoundMethod(String className, String methodName, String rubyName) {
Map<String, String> javaToRuby = boundMethods.get(className);
if (javaToRuby == null) {
javaToRuby = new HashMap<String, String>();
boundMethods.put(className, javaToRuby);
}
if (javaToRuby == null) boundMethods.put(className, javaToRuby = new HashMap<>());
javaToRuby.put(methodName, rubyName);
}

public void addBoundMethodsPacked(String className, String packedTuples) {
String[] names = Helpers.SEMICOLON_PATTERN.split(packedTuples);
for (int i = 0; i < names.length; i += 2) {
addBoundMethod(className, names[i], names[i+1]);
}
}

public void addSimpleBoundMethodsPacked(String className, String packedNames) {
String[] names = Helpers.SEMICOLON_PATTERN.split(packedNames);
for (String name : names) {
addBoundMethod(className, name, name);
}
}

public Map<String, Map<String, String>> getBoundMethods() {
return boundMethods;
}
20 changes: 10 additions & 10 deletions core/src/main/java/org/jruby/RubyBasicObject.java
View file
Original file line number Diff line number Diff line change
@@ -1744,33 +1744,33 @@ public IRubyObject send(ThreadContext context, IRubyObject[] args, Block block)
}

@JRubyMethod(name = "instance_eval",
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject instance_eval19(ThreadContext context, Block block) {
return specificEval(context, getInstanceEvalClass(), block, EvalType.INSTANCE_EVAL);
}
@JRubyMethod(name = "instance_eval",
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject instance_eval19(ThreadContext context, IRubyObject arg0, Block block) {
return specificEval(context, getInstanceEvalClass(), arg0, block, EvalType.INSTANCE_EVAL);
}
@JRubyMethod(name = "instance_eval",
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject instance_eval19(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
return specificEval(context, getInstanceEvalClass(), arg0, arg1, block, EvalType.INSTANCE_EVAL);
}
@JRubyMethod(name = "instance_eval",
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject instance_eval19(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
return specificEval(context, getInstanceEvalClass(), arg0, arg1, arg2, block, EvalType.INSTANCE_EVAL);
}

@JRubyMethod(name = "instance_exec", optional = 3, rest = true,
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject instance_exec19(ThreadContext context, IRubyObject[] args, Block block) {
if (!block.isGiven()) {
throw context.runtime.newLocalJumpErrorNoBlock();
8 changes: 4 additions & 4 deletions core/src/main/java/org/jruby/RubyKernel.java
View file
Original file line number Diff line number Diff line change
@@ -788,8 +788,8 @@ public static RubyBinding binding(ThreadContext context, IRubyObject recv, Block
}

@JRubyMethod(name = "binding", module = true, visibility = PRIVATE,
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public static RubyBinding binding19(ThreadContext context, IRubyObject recv, Block block) {
return RubyBinding.newBinding(context.runtime, context.currentBinding());
}
@@ -1002,8 +1002,8 @@ public static IRubyObject eval(ThreadContext context, IRubyObject recv, IRubyObj
}

@JRubyMethod(name = "eval", required = 1, optional = 3, module = true, visibility = PRIVATE,
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public static IRubyObject eval19(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
return evalCommon(context, recv, args, evalBinding19);
}
37 changes: 18 additions & 19 deletions core/src/main/java/org/jruby/RubyModule.java
View file
Original file line number Diff line number Diff line change
@@ -120,7 +120,6 @@
import static org.jruby.anno.FrameField.BLOCK;
import static org.jruby.anno.FrameField.CLASS;
import static org.jruby.anno.FrameField.FILENAME;
import static org.jruby.anno.FrameField.JUMPTARGET;
import static org.jruby.anno.FrameField.LASTLINE;
import static org.jruby.anno.FrameField.LINE;
import static org.jruby.anno.FrameField.METHODNAME;
@@ -2861,26 +2860,26 @@ public RubyModule undef_method(ThreadContext context, IRubyObject[] args) {
}

@JRubyMethod(name = {"module_eval", "class_eval"},
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject module_eval(ThreadContext context, Block block) {
return specificEval(context, this, block, EvalType.MODULE_EVAL);
}
@JRubyMethod(name = {"module_eval", "class_eval"},
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject module_eval(ThreadContext context, IRubyObject arg0, Block block) {
return specificEval(context, this, arg0, block, EvalType.MODULE_EVAL);
}
@JRubyMethod(name = {"module_eval", "class_eval"},
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject module_eval(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
return specificEval(context, this, arg0, arg1, block, EvalType.MODULE_EVAL);
}
@JRubyMethod(name = {"module_eval", "class_eval"},
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject module_eval(ThreadContext context, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) {
return specificEval(context, this, arg0, arg1, arg2, block, EvalType.MODULE_EVAL);
}
@@ -2890,8 +2889,8 @@ public IRubyObject module_eval(ThreadContext context, IRubyObject[] args, Block
}

@JRubyMethod(name = {"module_exec", "class_exec"},
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject module_exec(ThreadContext context, Block block) {
if (block.isGiven()) {
return yieldUnder(context, this, IRubyObject.NULL_ARRAY, block, EvalType.MODULE_EVAL);
@@ -2901,8 +2900,8 @@ public IRubyObject module_exec(ThreadContext context, Block block) {
}

@JRubyMethod(name = {"module_exec", "class_exec"}, rest = true,
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, JUMPTARGET, CLASS, FILENAME, SCOPE})
reads = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE},
writes = {LASTLINE, BACKREF, VISIBILITY, BLOCK, SELF, METHODNAME, LINE, CLASS, FILENAME, SCOPE})
public IRubyObject module_exec(ThreadContext context, IRubyObject[] args, Block block) {
if (block.isGiven()) {
return yieldUnder(context, this, args, block, EvalType.MODULE_EVAL);
@@ -4456,14 +4455,14 @@ private static void define(RubyModule module, JavaMethodDescriptor desc, final S
CallConfiguration needs = CallConfiguration.valueOf(AnnotationHelper.getCallerCallConfigNameByAnno(jrubyMethod));

if (needs.framing() == Framing.Full) {
Collection<String> frameAwareMethods = new ArrayList<>(4); // added to a Set - thus no need for another Set
AnnotationHelper.addMethodNamesToSet(frameAwareMethods, simpleName, names, aliases);
MethodIndex.FRAME_AWARE_METHODS.addAll(frameAwareMethods);
Map<String, JRubyMethod> frameAwareMethods = new HashMap<>(4); // added to a Set - thus no need for another Set
AnnotationHelper.addMethodNamesToMap(frameAwareMethods, null, simpleName, names, aliases);
MethodIndex.FRAME_AWARE_METHODS.addAll(frameAwareMethods.keySet());
}
if (needs.scoping() == Scoping.Full) {
Collection<String> scopeAwareMethods = new ArrayList<>(4); // added to a Set - thus no need for another Set
AnnotationHelper.addMethodNamesToSet(scopeAwareMethods, simpleName, names, aliases);
MethodIndex.SCOPE_AWARE_METHODS.addAll(scopeAwareMethods);
Map<String, JRubyMethod> scopeAwareMethods = new HashMap<>(4); // added to a Set - thus no need for another Set
AnnotationHelper.addMethodNamesToMap(scopeAwareMethods, null, simpleName, names, aliases);
MethodIndex.SCOPE_AWARE_METHODS.addAll(scopeAwareMethods.keySet());
}

RubyModule singletonClass;
Loading