Skip to content

Commit

Permalink
8240299: A possible bug about Object.setPrototypeOf().
Browse files Browse the repository at this point in the history
Reviewed-by: sundar
  • Loading branch information
szegedi committed Dec 17, 2020
1 parent 2da11aa commit 9b87e5d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,15 @@ public static Object getPrototypeOf(final Object self, final Object obj) {
*/
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object setPrototypeOf(final Object self, final Object obj, final Object proto) {
Global.checkObjectCoercible(self);

if (obj instanceof ScriptObject) {
((ScriptObject)obj).setPrototypeOf(proto);
return obj;
} else if (obj instanceof ScriptObjectMirror) {
((ScriptObjectMirror)obj).setProto(proto);
return obj;
}

throw notAnObject(obj);
return obj;
}

/**
Expand Down
35 changes: 35 additions & 0 deletions test/nashorn/script/basic/JDK-8240299.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (c) 2020, 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.
*/

/**
* JDK-8240299: Object.setPrototypeOf() should silently be no-op on non-objects
*
* @test
* @run
*/

var foo = function(){
var a = Object.setPrototypeOf("test", null);
print(a);
};
foo();
1 change: 1 addition & 0 deletions test/nashorn/script/basic/JDK-8240299.js.EXPECTED
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test

0 comments on commit 9b87e5d

Please sign in to comment.