Be more conservative and not disable dynscope if a zsuper is present

jruby · Oct 9, 2014 · 44bd989 · 44bd989
1 parent b6e67a3
commit 44bd989
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/passes/OptimizeDynScopesPass.java b/core/src/main/java/org/jruby/ir/passes/OptimizeDynScopesPass.java
@@ -120,8 +120,9 @@ public Object execute(IRScope scope, Object... data) {
         // Make sure flags are computed
         scope.computeScopeFlags();
 
+        // FIXME: USES_ZSUPER is probably wrong here.  zsuper use should toggle requires_dynscope?
         // Cannot run this on scopes that require dynamic scopes
-        if (scope.getFlags().contains(IRFlags.REQUIRES_DYNSCOPE)) {
+        if (scope.getFlags().contains(IRFlags.REQUIRES_DYNSCOPE) || scope.getFlags().contains(IRFlags.USES_ZSUPER)) {
             return null;
         }