Skip to content

Commit

Permalink
8319120: Unbound ScopedValue.get() throws the wrong exception
Browse files Browse the repository at this point in the history
Backport-of: ee6f25b5072a26254f79381a92216357d9f391f9
  • Loading branch information
shipilev committed Nov 27, 2023
1 parent f5045fc commit 19ce3ec
Showing 2 changed files with 66 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/java.base/share/classes/java/lang/ScopedValue.java
Original file line number Diff line number Diff line change
@@ -787,7 +787,8 @@ private static Snapshot scopedValueBindings() {
// Bindings can be in one of four states:
//
// 1: class Thread: this is a new Thread instance, and no
// scoped values have ever been bound in this Thread.
// scoped values have ever been bound in this Thread, and neither
// have any scoped value bindings been inherited from a parent.
// 2: EmptySnapshot.SINGLETON: This is effectively an empty binding.
// 3: A Snapshot instance: this contains one or more scoped value
// bindings.
@@ -798,18 +799,18 @@ private static Snapshot scopedValueBindings() {
Object bindings = Thread.scopedValueBindings();
if (bindings == NEW_THREAD_BINDINGS) {
// This must be a new thread
return Snapshot.EMPTY_SNAPSHOT;
return Snapshot.EMPTY_SNAPSHOT;
}
if (bindings == null) {
// Search the stack
bindings = Thread.findScopedValueBindings();
if (bindings == null) {
// Nothing on the stack.
if (bindings == NEW_THREAD_BINDINGS || bindings == null) {
// We've walked the stack without finding anything.
bindings = Snapshot.EMPTY_SNAPSHOT;
}
Thread.setScopedValueBindings(bindings);
}
assert (bindings != null);
Thread.setScopedValueBindings(bindings);
return (Snapshot) bindings;
}

60 changes: 60 additions & 0 deletions test/jdk/java/lang/ScopedValue/UnboundValueAfterOOME.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Copyright (c) 2023 Red Hat, Inc. 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.
*/

import java.util.NoSuchElementException;

/*
* @test
* @bug 8319120
* @enablePreview
* @run main/othervm -Xmx10m UnboundValueAfterOOME
*/
public class UnboundValueAfterOOME {

static final Thread doRun = new Thread() {
public void run() {
try {
try {
// Provoke the VM to throw an OutOfMemoryError
java.util.Arrays.fill(new int[Integer.MAX_VALUE][], new int[Integer.MAX_VALUE]);
} catch (OutOfMemoryError e) {
// Try to get() an unbound ScopedValue
ScopedValue.newInstance().get();
}
} catch (NoSuchElementException e) {
System.out.println("OK");
return;
}
throw new RuntimeException("Expected NoSuchElementException");
}
};

public static void main(String [] args) throws Exception {
doRun.run(); // Run on this Thread
var job = new Thread(doRun);
job.start(); // Run on a new Thread
job.join();
doRun.start(); // Run on the Thread doRun
doRun.join();
}
}

1 comment on commit 19ce3ec

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.