# HG changeset patch
# User hseigel
# Date 1364416004 25200
# Node ID b601102d00c80dc1d7508c2574f000c6a9d8e7d4
# Parent  0c3ee6f1fa23d9960d26c3a906ef6317ce2a63e6# Parent  aa758f0c5b1c4cabdcf53b02e45e0e9b5a8a7ff2
Merge

diff -r 0c3ee6f1fa23 -r b601102d00c8 test/runtime/7116786/Test7116786.java
--- a/test/runtime/7116786/Test7116786.java	Wed Mar 27 08:19:50 2013 -0400
+++ b/test/runtime/7116786/Test7116786.java	Wed Mar 27 13:26:44 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -338,9 +338,12 @@
                  "invalid constant pool index in ldc",
                  "Invalid index in ldc"),
 
-        new Case("case58", "verifier.cpp", true, "verify_switch",
+        /* No longer a valid test case for bytecode version >= 51. Nonzero
+         * padding bytes are permitted with lookupswitch and tableswitch
+         * bytecodes as of JVMS 3d edition */
+        new Case("case58", "verifier.cpp", false, "verify_switch",
                  "bad switch padding",
-                 "Nonzero padding byte in lookswitch or tableswitch"),
+                 "Nonzero padding byte in lookupswitch or tableswitch"),
 
         new Case("case59", "verifier.cpp", true, "verify_switch",
                  "tableswitch low is greater than high",