--- old/test/hotspot/jtreg/runtime/appcds/test-classes/MethodNoReturn.jasm 2019-07-24 08:28:24.433467079 -0400 +++ /dev/null 2019-07-22 09:37:15.068007775 -0400 @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2017, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -/* -WAS: - -class MethodNoReturn { - void badMethod() {} -} -*/ - -super class MethodNoReturn - version 52:0 -{ - - -Method "":"()V" - stack 1 locals 1 -{ - aload_0; - invokespecial Method java/lang/Object."":"()V"; - return; -} - -Method badMethod:"()V" - stack 0 locals 1 -{ - /* - should be: - return; - */ - - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - pop; - iconst_1; - iconst_1; - iconst_1; - iconst_1; - iconst_1; - iconst_1; - iconst_1; - iconst_1; - pop; - pop; - pop; - pop; - pop; - pop; - pop; - pop; - // no return here -- so this class will fail verification -} - -} // end Class MethodNoReturn --- /dev/null 2019-07-22 09:37:15.068007775 -0400 +++ new/test/hotspot/jtreg/runtime/cds/test-classes/MethodNoReturn.jasm 2019-07-24 08:28:24.121467090 -0400 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2017, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/* +WAS: + +class MethodNoReturn { + void badMethod() {} +} +*/ + +super class MethodNoReturn + version 52:0 +{ + + +Method "":"()V" + stack 1 locals 1 +{ + aload_0; + invokespecial Method java/lang/Object."":"()V"; + return; +} + +Method badMethod:"()V" + stack 0 locals 1 +{ + /* + should be: + return; + */ + + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + pop; + iconst_1; + iconst_1; + iconst_1; + iconst_1; + iconst_1; + iconst_1; + iconst_1; + iconst_1; + pop; + pop; + pop; + pop; + pop; + pop; + pop; + pop; + // no return here -- so this class will fail verification +} + +} // end Class MethodNoReturn