[IR] Implement GVarAliasInstr.

jruby · Feb 7, 2014 · bd79d63 · bd79d63
1 parent 93faf93
commit bd79d63
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1089,12 +1089,15 @@ public void ExceptionRegionStartMarkerInstr(ExceptionRegionStartMarkerInstr exce
 
     @Override
     public void GetClassVarContainerModuleInstr(GetClassVarContainerModuleInstr getclassvarcontainermoduleinstr) {
-        super.GetClassVarContainerModuleInstr(getclassvarcontainermoduleinstr);    //To change body of overridden methods use File | Settings | File Templates.
+        // This appears to require a reference to a StaticScope from...somewhere. It's not clear what scope this is
+        // nor how we would get access to it from the compiled code.
+        super.GetClassVarContainerModuleInstr(getclassvarcontainermoduleinstr);
     }
 
     @Override
     public void GetClassVariableInstr(GetClassVariableInstr getclassvariableinstr) {
-        super.GetClassVariableInstr(getclassvariableinstr);    //To change body of overridden methods use File | Settings | File Templates.
+        // Does it make sense to try to implement this without GetClassVarContainerModuleInstr working?
+        super.GetClassVariableInstr(getclassvariableinstr);
     }
 
     @Override
@@ -1118,7 +1121,13 @@ public void GetGlobalVariableInstr(GetGlobalVariableInstr getglobalvariableinstr
 
     @Override
     public void GVarAliasInstr(GVarAliasInstr gvaraliasinstr) {
-        super.GVarAliasInstr(gvaraliasinstr);    //To change body of overridden methods use File | Settings | File Templates.
+        jvm.method().loadRuntime();
+        jvm.method().adapter.invokevirtual(p(Ruby.class), "getGlobalVariables", sig(GlobalVariables.class));
+        visit(gvaraliasinstr.getNewName());
+        jvm.method().adapter.invokevirtual(p(Object.class), "toString", sig(String.class));
+        visit(gvaraliasinstr.getOldName());
+        jvm.method().adapter.invokevirtual(p(Object.class), "toString", sig(String.class));
+        jvm.method().adapter.invokevirtual(p(GlobalVariables.class), "alias", sig(void.class, String.class, String.class));
     }
 
     @Override