Implement JVM part of ModuleVersionGuardInstr.

jruby · Jan 24, 2017 · b59a143 · b59a143
1 parent e0209c9
commit b59a143
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/instructions/ModuleVersionGuardInstr.java b/core/src/main/java/org/jruby/ir/instructions/ModuleVersionGuardInstr.java
@@ -68,4 +68,8 @@ public Object interpret(ThreadContext context, StaticScope currScope, DynamicSco
 
         return context.nil; /* not used */
     }
+
+    public int getIPC() {
+        return ipc;
+    }
 }
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1493,7 +1493,10 @@ public void MatchInstr(MatchInstr matchInstr) {
 
     @Override
     public void ModuleVersionGuardInstr(ModuleVersionGuardInstr moduleversionguardinstr) {
-//        throw new NotCompilableException("Unsupported instruction: " + moduleversionguardinstr);
+        visit(moduleversionguardinstr.getCandidateObject());
+        jvmAdapter().pushInt(moduleversionguardinstr.getExpectedVersion());
+        jvmAdapter().pushInt(moduleversionguardinstr.getIPC());
+        jvmMethod().invokeHelper("isGenerationEqual", void.class, IRubyObject.class, int.class, int.class);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -30,6 +30,7 @@
 import org.jruby.ir.Interp;
 import org.jruby.ir.JIT;
 import org.jruby.ir.operands.UndefinedValue;
+import org.jruby.ir.runtime.IRDeoptimization;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.javasupport.JavaClass;
 import org.jruby.javasupport.JavaUtil;
@@ -2190,6 +2191,12 @@ public static boolean isGenerationEqual(IRubyObject object, int generation) {
         return metaClass.getGeneration() == generation;
     }
 
+    public static void checkGeneration(IRubyObject object, int generation, int ipc) {
+        if (!isGenerationEqual(object, generation)) {
+            throw new IRDeoptimization(ipc);
+        }
+    }
+
     public static String[] getScopeNames(String scopeNames) {
         StringTokenizer toker = new StringTokenizer(scopeNames, ";");
         ArrayList list = new ArrayList(10);