8208172: SIGSEGV when owner of invokedynamic bootstrap method throws an exception - Symbol::increment_refcount()+0x0

Table for resolution errors always expect non-null message string.

Reviewed-by: dholmes, iklam
This commit is contained in:
Coleen Phillimore 2018-08-22 07:51:07 -04:00
parent ce61e39060
commit b1ce2c0fe8
6 changed files with 180 additions and 7 deletions
src/hotspot/share
test/hotspot/jtreg/runtime/BootstrapMethod

@ -65,9 +65,10 @@ void ResolutionErrorEntry::set_error(Symbol* e) {
}
void ResolutionErrorEntry::set_message(Symbol* c) {
assert(c != NULL, "must set a value");
_message = c;
_message->increment_refcount();
if (_message != NULL) {
_message->increment_refcount();
}
}
// create new error entry
@ -87,7 +88,9 @@ void ResolutionErrorTable::free_entry(ResolutionErrorEntry *entry) {
// decrement error refcount
assert(entry->error() != NULL, "error should be set");
entry->error()->decrement_refcount();
entry->message()->decrement_refcount();
if (entry->message() != NULL) {
entry->message()->decrement_refcount();
}
Hashtable<ConstantPool*, mtClass>::free_entry(entry);
}

@ -769,10 +769,14 @@ Symbol* ConstantPool::exception_message(const constantPoolHandle& this_cp, int w
void ConstantPool::throw_resolution_error(const constantPoolHandle& this_cp, int which, TRAPS) {
Symbol* message = NULL;
Symbol* error = SystemDictionary::find_resolution_error(this_cp, which, &message);
assert(error != NULL && message != NULL, "checking");
assert(error != NULL, "checking");
CLEAR_PENDING_EXCEPTION;
ResourceMark rm;
THROW_MSG(error, message->as_C_string());
if (message != NULL) {
ResourceMark rm;
THROW_MSG(error, message->as_C_string());
} else {
THROW(error);
}
}
// If resolution for Class, Dynamic constant, MethodHandle or MethodType fails, save the

@ -477,7 +477,6 @@ bool ConstantPoolCacheEntry::save_and_throw_indy_exc(
Symbol* error = PENDING_EXCEPTION->klass()->name();
Symbol* message = java_lang_Throwable::detail_message(PENDING_EXCEPTION);
assert(message != NULL, "Missing detail message");
SystemDictionary::add_resolution_error(cpool, index, error, message);
set_indy_resolution_failed();

@ -0,0 +1,50 @@
/*
* Copyright (c) 2018, 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.
*/
/*
* @test
* @bug 8208172
* @library /test/lib
* @compile TestPkg/LambdaMetafactory.java
* @compile TestPkg/Lambda.jasm
* @run main TestLambdaExceptionInInitializer
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class TestLambdaExceptionInInitializer {
public static void main(String args[]) throws Throwable {
// Run Lamba class
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("TestPkg.Lambda");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("Exception in thread \"main\" java.lang.ExceptionInInitializerError");
output.shouldContain("Caused by: java.lang.NullPointerException");
output.shouldContain("at TestPkg.LambdaMetafactory.throwNpe(LambdaMetafactory.java:34)");
output.shouldContain("at TestPkg.LambdaMetafactory.<clinit>(LambdaMetafactory.java:30)");
output.shouldHaveExitValue(1);
}
}

@ -0,0 +1,66 @@
/*
* Copyright (c) 2018, 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.
*/
// Generated file to call Metafactory that gets NPE in initializer while
// calling the bootstrap method.
package TestPkg;
super public final class Lambda
version 52:0
{
public Method "<init>":"()V"
stack 1 locals 1
{
aload_0;
invokespecial Method java/lang/Object."<init>":"()V";
return;
}
public Method test:"()V"
stack 1 locals 2
{
invokedynamic InvokeDynamic REF_invokeStatic:LambdaMetafactory.metafactory:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;":run:"()Ljava/lang/Runnable;" MethodType "()V", MethodHandle REF_invokeStatic:Lambda.lambda$test$0:"()V", MethodType "()V";
astore_1;
return;
}
private static synthetic Method lambda$test$0:"()V"
stack 0 locals 0
{
return;
}
public static Method main:"([Ljava/lang/String;)V"
stack 2 locals 1
{
new class Lambda;
dup;
invokespecial Method "<init>":"()V";
invokevirtual Method test:"()V";
return;
}
} // end Class Lambda

@ -0,0 +1,51 @@
/*
* Copyright (c) 2018, 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.
*/
package TestPkg;
import java.lang.invoke.LambdaConversionException;
public class LambdaMetafactory {
static {
throwNpe(); // ExceptionInInitializerError
}
static void throwNpe(){
throw new NullPointerException();
}
public static java.lang.invoke.CallSite metafactory(java.lang.invoke.MethodHandles.Lookup owner,
String invokedName,
java.lang.invoke.MethodType invokedType,
java.lang.invoke.MethodType samMethodType,
java.lang.invoke.MethodHandle implMethod,
java.lang.invoke.MethodType instantiatedMethodType)
throws LambdaConversionException {
return java.lang.invoke.LambdaMetafactory.metafactory(owner,
invokedName,
invokedType,
samMethodType,
implMethod,
instantiatedMethodType);
}
}