archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8026124: JSR-292 bug: java.nio.file.Path.toString cores dump

Browse source 
Catch problem case, assert it matches valid input, new test

Reviewed-by: jrose, twisti, kvn
This commit is contained in:
David Chase 2013-10-12 17:26:41 -04:00
parent d03157f2cf
commit b1d7228bff
3 changed files with 83 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hotspot/src/share/vm/interpreter/linkResolver.cpp
View file

@ -1,4 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
@ -158,6 +159,22 @@ CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass) {
index = vt->index_of_miranda(resolved_method->name(), index = vt->index_of_miranda(resolved_method->name(),
resolved_method->signature()); resolved_method->signature());
kind = CallInfo::vtable_call; kind = CallInfo::vtable_call;
} else if (resolved_method->has_vtable_index()) {
// Can occur if an interface redeclares a method of Object.
#ifdef ASSERT
// Ensure that this is really the case.
KlassHandle object_klass = SystemDictionary::Object_klass();
Method * object_resolved_method = object_klass()->vtable()->method_at(index);
assert(object_resolved_method->name() == resolved_method->name(),
err_msg("Object and interface method names should match at vtable index %d, %s != %s",
index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string()));
assert(object_resolved_method->signature() == resolved_method->signature(),
err_msg("Object and interface method signatures should match at vtable index %d, %s != %s",
index, object_resolved_method->signature()->as_C_string(), resolved_method->signature()->as_C_string()));
#endif // ASSERT
kind = CallInfo::vtable_call;
} else { } else {
// A regular interface call. // A regular interface call.
kind = CallInfo::itable_call; kind = CallInfo::itable_call;

40
hotspot/test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java Normal file
View file

@ -0,0 +1,40 @@
/*
* Copyright (c) 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
* 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 8026124
* @summary Javascript file provoked assertion failure in linkResolver.cpp
*
* @run main/othervm CreatesInterfaceDotEqualsCallInfo
*/
public class CreatesInterfaceDotEqualsCallInfo {
public static void main(String[] args) throws java.io.IOException {
String[] jsargs = { System.getProperty("test.src", ".") +
"/createsInterfaceDotEqualsCallInfo.js" };
jdk.nashorn.tools.Shell.main(System.in, System.out, System.err, jsargs);
System.out.println("PASS, did not crash running Javascript");
}
}

26
hotspot/test/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js Normal file
View file

@ -0,0 +1,26 @@
/*
* Copyright (c) 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
* 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.
*
*/
var path = new java.io.File("/Users/someone").toPath();
path.toString();