8357993: Use "stdin.encoding" for reading System.in with InputStreamReader/Scanner [hotspot]

Reviewed-by: cjplummer, sspitsyn

Author: vy

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, 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
@@ -28,6 +28,7 @@
 import sun.jvm.hotspot.debugger.*;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.util.*;
 
 public class CLHSDB {
@@ -106,8 +107,8 @@ public void reattach() {
             };
 
 
-        BufferedReader in =
-            new BufferedReader(new InputStreamReader(System.in));
+        Charset charset = Charset.forName(System.getProperty("stdin.encoding"), Charset.defaultCharset());
+        BufferedReader in = new BufferedReader(new InputStreamReader(System.in, charset));
         CommandProcessor cp = new CommandProcessor(di, in, System.out, System.err);
         cp.run(true);
 

src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/UserInterface.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, 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
@@ -27,6 +27,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 
 public final class UserInterface {
 
@@ -40,7 +41,8 @@ public void println(String text) {
 
     public String readLine() throws AbortException {
         try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+            Charset charset = Charset.forName(System.getProperty("stdin.encoding"), Charset.defaultCharset());
+            BufferedReader br = new BufferedReader(new InputStreamReader(System.in, charset));
             String line = br.readLine();
             if (line == null || line.equalsIgnoreCase("Q")) {
                 println();

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, 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
@@ -60,7 +60,8 @@ protected void agentActions() throws Throwable {
         FileInputStream newInputStream = new FileInputStream(inStreamFileName);
         System.setIn(newInputStream);
 
-        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(System.in));
+        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(
+                System.in, System.getProperty("stdin.encoding")));
         int readValue = Integer.parseInt(inputStreamReader.readLine());
 
         if (readValue != valueToWrite) {

test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, 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
@@ -173,7 +173,7 @@ private int runIt(String argv[], PrintStream out) {
         }
 
         BufferedReader stdIn = new BufferedReader(
-            new InputStreamReader(System.in));
+            new InputStreamReader(System.in, System.getProperty("stdin.encoding")));
         try (ListeningThread listeningThread = new ListeningThread(this)) {
             listeningThread.bind();
             listeningThread.start();