Wed, 27 Mar 2013 13:26:44 -0700
Merge
1.1 --- a/test/runtime/7116786/Test7116786.java Wed Mar 27 08:19:50 2013 -0400 1.2 +++ b/test/runtime/7116786/Test7116786.java Wed Mar 27 13:26:44 2013 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -338,9 +338,12 @@ 1.11 "invalid constant pool index in ldc", 1.12 "Invalid index in ldc"), 1.13 1.14 - new Case("case58", "verifier.cpp", true, "verify_switch", 1.15 + /* No longer a valid test case for bytecode version >= 51. Nonzero 1.16 + * padding bytes are permitted with lookupswitch and tableswitch 1.17 + * bytecodes as of JVMS 3d edition */ 1.18 + new Case("case58", "verifier.cpp", false, "verify_switch", 1.19 "bad switch padding", 1.20 - "Nonzero padding byte in lookswitch or tableswitch"), 1.21 + "Nonzero padding byte in lookupswitch or tableswitch"), 1.22 1.23 new Case("case59", "verifier.cpp", true, "verify_switch", 1.24 "tableswitch low is greater than high",