@@ -78,8 +78,7 @@ public class ClassGen { cfw.startMethod("get", GET_STRING_SIGNATURE, PUBLIC_FINAL); int notFound = cfw.acquireLabel(); generateIdSwitch(cfw, swtch, notFound, false, Method.GET); - if (notFound != -1) - cfw.markLabel(notFound); + cfw.markLabel(notFound); loadNotFound(cfw); cfw.add(ByteCode.ARETURN); cfw.stopMethod((short) 4); @@ -303,13 +302,20 @@ public class ClassGen { cfw.markTableSwitchDefault(switchStart); cfw.add(ByteCode.GOTO, notFound); Case cs = swtch.firstcase; - // int index = 0; + int localNotFound = -1; for (int value = minValue; value <= maxValue; value++) { - cfw.markTableSwitchCase(switchStart, value - minValue); if (cs == null || cs.value != value) { - cfw.add(ByteCode.GOTO, notFound); + if (localNotFound == -1) { + cfw.markTableSwitchCase(switchStart, value - minValue); + localNotFound = cfw.getCurrentCodeOffset(); + cfw.add(ByteCode.GOTO, notFound); + } else { + // reuse previously created code for unhandled case + cfw.setTableSwitchJump(switchStart, value - minValue, localNotFound); + } continue; } else { + cfw.markTableSwitchCase(switchStart, value - minValue); if (cs.subswitch != null) { generateIdSwitch(cfw, cs.subswitch, notFound, true, type); } else { src/org/mozilla/javascript/adaptive/ClassGen.java 9daab71dc1426f76b0b74c48beb18c57fbf7749b Hannes Wallnöfer hannesw@gmail.com http://github.com/hns/rhino-8/commit/d00e46306d2fec3fc71fde5eb64062c14881ee45 d00e46306d2fec3fc71fde5eb64062c14881ee45 2009-11-03T02:58:08-08:00 2009-11-03T02:58:08-08:00 Remove duplicate bytecode for unhandled switch cases d037377970a62e23e0c4fec87f1de63c4bfefd04 Hannes Wallnöfer hannesw@gmail.com