Merge

Reviewed-by: jpai

Author: Brent Christian

src/hotspot/share/opto/phaseX.cpp

@@ -1954,6 +1954,7 @@ void PhaseCCP::push_more_uses(Unique_Node_List& worklist, Node* parent, const No
  push_and(worklist, parent, use);
  push_cast_ii(worklist, parent, use);
  push_opaque_zero_trip_guard(worklist, use);
+ push_bool_with_cmpu_and_mask(worklist, use);
 }
 
 
@@ -2000,6 +2001,57 @@ void PhaseCCP::push_cmpu(Unique_Node_List& worklist, const Node* use) const {
  }
 }
 
+// Look for the following shape, which can be optimized by BoolNode::Value_cmpu_and_mask() (i.e. corresponds to case
+// (1b): "(m & x) <u (m + 1))".
+// If any of the inputs on the level (%%) change, we need to revisit Bool because we could have prematurely found that
+// the Bool is constant (i.e. case (1b) can be applied) which could become invalid with new type information during CCP.
+//
+// m x m 1 (%%)
+// \ / \ /
+// AndI AddI
+// \ /
+// CmpU
+// |
+// Bool
+//
+void PhaseCCP::push_bool_with_cmpu_and_mask(Unique_Node_List& worklist, const Node* use) const {
+ uint use_op = use->Opcode();
+ if (use_op != Op_AndI && (use_op != Op_AddI || use->in(2)->find_int_con(0) != 1)) {
+ // Not "m & x" or "m + 1"
+ return;
+ }
+ for (DUIterator_Fast imax, i = use->fast_outs(imax); i < imax; i++) {
+ Node* cmpu = use->fast_out(i);
+ if (cmpu->Opcode() == Op_CmpU) {
+ push_bool_matching_case1b(worklist, cmpu);
+ }
+ }
+}
+
+// Push any Bool below 'cmpu' that matches case (1b) of BoolNode::Value_cmpu_and_mask().
+void PhaseCCP::push_bool_matching_case1b(Unique_Node_List& worklist, const Node* cmpu) const {
+ assert(cmpu->Opcode() == Op_CmpU, "must be");
+ for (DUIterator_Fast imax, i = cmpu->fast_outs(imax); i < imax; i++) {
+ Node* bol = cmpu->fast_out(i);
+ if (!bol->is_Bool() || bol->as_Bool()->_test._test != BoolTest::lt) {
+ // Not a Bool with "<u"
+ continue;
+ }
+ Node* andI = cmpu->in(1);
+ Node* addI = cmpu->in(2);
+ if (andI->Opcode() != Op_AndI || addI->Opcode() != Op_AddI || addI->in(2)->find_int_con(0) != 1) {
+ // Not "m & x" and "m + 1"
+ continue;
+ }
+
+ Node* m = addI->in(1);
+ if (m == andI->in(1) || m == andI->in(2)) {
+ // Is "m" shared? Matched (1b) and thus we revisit Bool.
+ push_if_not_bottom_type(worklist, bol);
+ }
+ }
+}
+
 // If n is used in a counted loop exit condition, then the type of the counted loop's Phi depends on the type of 'n'.
 // Seem PhiNode::Value().
 void PhaseCCP::push_counted_loop_phi(Unique_Node_List& worklist, Node* parent, const Node* use) {

src/hotspot/share/opto/phaseX.hpp

@@ -627,6 +627,8 @@ class PhaseCCP : public PhaseIterGVN {
  void push_and(Unique_Node_List& worklist, const Node* parent, const Node* use) const;
  void push_cast_ii(Unique_Node_List& worklist, const Node* parent, const Node* use) const;
  void push_opaque_zero_trip_guard(Unique_Node_List& worklist, const Node* use) const;
+ void push_bool_with_cmpu_and_mask(Unique_Node_List& worklist, const Node* use) const;
+ void push_bool_matching_case1b(Unique_Node_List& worklist, const Node* cmpu) const;
 
  public:
  PhaseCCP( PhaseIterGVN *igvn ); // Compute conditional constants

src/hotspot/share/opto/subnode.cpp

@@ -1885,7 +1885,7 @@ const Type* BoolNode::Value_cmpu_and_mask(PhaseValues* phase) const {
  // (1b) "(x & m) <u m + 1" and "(m & x) <u m + 1", cmp2 = m + 1
  Node* rhs_m = cmp2->in(1);
  const TypeInt* rhs_m_type = phase->type(rhs_m)->isa_int();
- if (rhs_m_type->_lo > -1 || rhs_m_type->_hi < -1) {
+ if (rhs_m_type != nullptr && (rhs_m_type->_lo > -1 || rhs_m_type->_hi < -1)) {
  // Exclude any case where m == -1 is possible.
  m = rhs_m;
  }
@@ -1903,12 +1903,16 @@ const Type* BoolNode::Value_cmpu_and_mask(PhaseValues* phase) const {
 // Simplify a Bool (convert condition codes to boolean (1 or 0)) node,
 // based on local information. If the input is constant, do it.
 const Type* BoolNode::Value(PhaseGVN* phase) const {
+ const Type* input_type = phase->type(in(1));
+ if (input_type == Type::TOP) {
+ return Type::TOP;
+ }
  const Type* t = Value_cmpu_and_mask(phase);
  if (t != nullptr) {
  return t;
  }
 
- return _test.cc2logical( phase->type( in(1) ) );
+ return _test.cc2logical(input_type);
 }
 
 #ifndef PRODUCT

src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -24,8 +24,6 @@
  */
 package sun.net.ftp.impl;
 
-
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -61,13 +59,15 @@
 import java.util.regex.Pattern;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
+
 import sun.net.ftp.FtpDirEntry;
 import sun.net.ftp.FtpDirParser;
 import sun.net.ftp.FtpProtocolException;
 import sun.net.ftp.FtpReplyCode;
 import sun.net.util.IPAddressUtil;
 import sun.util.logging.PlatformLogger;
 
+import static sun.net.util.ProxyUtil.copyProxy;
 
 public class FtpClient extends sun.net.ftp.FtpClient {
 
@@ -954,7 +954,7 @@ public int getReadTimeout() {
  }
 
  public sun.net.ftp.FtpClient setProxy(Proxy p) {
- proxy = p;
+ proxy = copyProxy(p);
  return this;
  }
 

src/java.base/share/classes/sun/net/util/ProxyUtil.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 sun.net.util;
+
+import sun.net.ApplicationProxy;
+
+import java.net.Proxy;
+
+public final class ProxyUtil {
+
+ private ProxyUtil() {}
+
+ /**
+ * Creates a new {@link Proxy} instance for the given proxy iff it is
+ * neither null, {@link Proxy#NO_PROXY Proxy.NO_PROXY}, an
+ * {@link ApplicationProxy} instance, nor already a {@code Proxy} instance.
+ */
+ public static Proxy copyProxy(Proxy proxy) {
+ return proxy == null
+ || proxy.getClass() == Proxy.class
+ || proxy instanceof ApplicationProxy
+ ? proxy
+ : new Proxy(proxy.type(), proxy.address());
+ }
+
+}

src/java.base/share/classes/sun/net/www/http/HttpClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -41,6 +41,8 @@
 import sun.net.www.protocol.http.AuthCacheImpl;
 import sun.net.www.protocol.http.HttpURLConnection;
 import sun.util.logging.PlatformLogger;
+
+import static sun.net.util.ProxyUtil.copyProxy;
 import static sun.net.www.protocol.http.HttpURLConnection.TunnelState.*;
 
 /**
@@ -261,7 +263,7 @@ public HttpClient(URL url, String proxyHost, int proxyPort)
  }
 
  protected HttpClient(URL url, Proxy p, int to) throws IOException {
- proxy = (p == null) ? Proxy.NO_PROXY : p;
+ proxy = p == null ? Proxy.NO_PROXY : copyProxy(p);
  this.host = url.getHost();
  this.url = url;
  port = url.getPort();
@@ -326,9 +328,7 @@ public static HttpClient New(URL url, boolean useCache)
  public static HttpClient New(URL url, Proxy p, int to, boolean useCache,
  HttpURLConnection httpuc) throws IOException
  {
- if (p == null) {
- p = Proxy.NO_PROXY;
- }
+ p = p == null ? Proxy.NO_PROXY : copyProxy(p);
  HttpClient ret = null;
  /* see if one's already around */
  if (useCache) {

src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java

@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.StringTokenizer;
 import java.security.Permission;
+
 import sun.net.NetworkClient;
 import sun.net.util.IPAddressUtil;
 import sun.net.www.MessageHeader;
@@ -53,6 +54,7 @@
 import sun.net.ftp.FtpProtocolException;
 import sun.net.www.ParseUtil;
 
+import static sun.net.util.ProxyUtil.copyProxy;
 
 /**
  * This class Opens an FTP input (or output) stream given a URL.
@@ -234,7 +236,7 @@ public synchronized void connect() throws IOException {
  throw new IOException("Failed to select a proxy", iae);
  }
  for (Proxy proxy : proxies) {
- p = proxy;
+ p = copyProxy(proxy);
  if (p == null || p == Proxy.NO_PROXY ||
  p.type() == Proxy.Type.SOCKS) {
  break;

src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -33,11 +33,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.Proxy;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Objects;
-import sun.net.ftp.FtpClient;
-import sun.net.www.protocol.http.HttpURLConnection;
+
+import static sun.net.util.ProxyUtil.copyProxy;
 
 /** open an ftp connection given a URL */
 public class Handler extends java.net.URLStreamHandler {
@@ -57,11 +55,11 @@ protected java.net.URLConnection openConnection(URL u)
  return openConnection(u, null);
  }
 
- protected java.net.URLConnection openConnection(URL u, Proxy p)
+ protected java.net.URLConnection openConnection(URL u, Proxy proxy)
  throws IOException {
- FtpURLConnection connection = null;
+ FtpURLConnection connection;
  try {
- connection = new FtpURLConnection(u, p);
+ connection = new FtpURLConnection(u, copyProxy(proxy));
  } catch (IllegalArgumentException e) {
  var mfue = new MalformedURLException(e.getMessage());
  mfue.initCause(e);

src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java

@@ -77,6 +77,7 @@
 import java.util.Objects;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static sun.net.util.ProxyUtil.copyProxy;
 import static sun.net.www.protocol.http.AuthScheme.BASIC;
 import static sun.net.www.protocol.http.AuthScheme.DIGEST;
 import static sun.net.www.protocol.http.AuthScheme.NTLM;
@@ -854,7 +855,7 @@ protected HttpURLConnection(URL u, Proxy p, Handler handler)
  responses = new MessageHeader(maxHeaderSize);
  userHeaders = new MessageHeader();
  this.handler = handler;
- instProxy = p;
+ instProxy = copyProxy(p);
  cookieHandler = CookieHandler.getDefault();
  cacheHandler = ResponseCache.getDefault();
  }
@@ -956,7 +957,7 @@ protected void plainConnect0() throws IOException {
  final Iterator<Proxy> it = proxies.iterator();
  Proxy p;
  while (it.hasNext()) {
- p = it.next();
+ p = copyProxy(it.next());
  try {
  if (!failedOnce) {
  http = getNewHttpClient(url, p, connectTimeout);

src/java.base/share/classes/sun/security/ssl/CertificateMessage.java

@@ -1097,6 +1097,15 @@ public void consume(ConnectionContext context,
 
  // clean up this consumer
  hc.handshakeConsumers.remove(SSLHandshake.CERTIFICATE.id);
+
+ // Ensure that the Certificate message has not been sent w/o
+ // an EncryptedExtensions preceding
+ if (hc.handshakeConsumers.containsKey(
+ SSLHandshake.ENCRYPTED_EXTENSIONS.id)) {
+ throw hc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+ "Unexpected Certificate handshake message");
+ }
+
  T13CertificateMessage cm = new T13CertificateMessage(hc, message);
  if (hc.sslConfig.isClientMode) {
  if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {