Fix jruby#2417. Rescue clause yielding TypeError hits %undefined

enebo · enebo · commit eb77f18eeeaf · 2015-01-19T09:46:14.000-06:00
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -3124,7 +3124,7 @@ private void buildRescueBodyInternal(IRScope s, RescueBodyNode rescueBodyNode, V
             // of StandardError.  I am ignoring this for now and treating this as undefined behavior.
             //
             // Solution: Create a 'StandardError' operand type to eliminate this.
-            Variable v = addResultInstr(s, new InheritanceSearchConstInstr(s.createTemporaryVariable(), s.getCurrentModuleVariable(), "StandardError", false));
+            Variable v = addResultInstr(s, new InheritanceSearchConstInstr(s.createTemporaryVariable(), new ObjectClass(), "StandardError", false));
             outputExceptionCheck(s, v, exc, caughtLabel);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3124,7 +3124,7 @@ private void buildRescueBodyInternal(IRScope s, RescueBodyNode rescueBodyNode, V`
`3124`	`3124`	`// of StandardError. I am ignoring this for now and treating this as undefined behavior.`
`3125`	`3125`	`//`
`3126`	`3126`	`// Solution: Create a 'StandardError' operand type to eliminate this.`
`3127`		`- Variable v = addResultInstr(s, new InheritanceSearchConstInstr(s.createTemporaryVariable(), s.getCurrentModuleVariable(), "StandardError", false));`
	`3127`	`+ Variable v = addResultInstr(s, new InheritanceSearchConstInstr(s.createTemporaryVariable(), new ObjectClass(), "StandardError", false));`
`3128`	`3128`	`outputExceptionCheck(s, v, exc, caughtLabel);`
`3129`	`3129`	`}`
`3130`	`3130`