Merge branch 'upstream-master'

Author: Datadog Syncup Service

src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp

@@ -258,12 +258,25 @@ void ObjectSampler::add(HeapWord* obj, size_t allocated, traceid thread_id, bool
       // quick reject, will not fit
       return;
     }
-    sample = _list->reuse(_priority_queue->pop());
+    ObjectSample* popped = _priority_queue->pop();
+    size_t popped_span = popped->span();
+    ObjectSample* previous = popped->prev();
+    sample = _list->reuse(popped);
+    assert(sample != nullptr, "invariant");
+    if (previous != nullptr) {
+      push_span(previous, popped_span);
+      sample->set_span(span);
+    } else {
+      // The removed sample was the youngest sample in the list, which means the new sample is now the youngest
+      // sample. It should cover the spans of both.
+      sample->set_span(span + popped_span);
+    }
   } else {
     sample = _list->get();
+    assert(sample != nullptr, "invariant");
+    sample->set_span(span);
   }
 
-  assert(sample != nullptr, "invariant");
   signal_unresolved_entry();
   sample->set_thread_id(thread_id);
   if (virtual_thread) {
@@ -278,7 +291,6 @@ void ObjectSampler::add(HeapWord* obj, size_t allocated, traceid thread_id, bool
     sample->set_stack_trace_hash(stacktrace_hash);
   }
 
-  sample->set_span(allocated);
   sample->set_object(cast_to_oop(obj));
   sample->set_allocated(allocated);
   sample->set_allocation_time(JfrTicks::now());
@@ -305,14 +317,18 @@ void ObjectSampler::remove_dead(ObjectSample* sample) {
   ObjectSample* const previous = sample->prev();
   // push span onto previous
   if (previous != nullptr) {
-    _priority_queue->remove(previous);
-    previous->add_span(sample->span());
-    _priority_queue->push(previous);
+    push_span(previous, sample->span());
   }
   _priority_queue->remove(sample);
   _list->release(sample);
 }
 
+void ObjectSampler::push_span(ObjectSample* sample, size_t span) {
+    _priority_queue->remove(sample);
+    sample->add_span(span);
+    _priority_queue->push(sample);
+}
+
 ObjectSample* ObjectSampler::last() const {
   return _list->last();
 }

src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp

@@ -64,6 +64,7 @@ class ObjectSampler : public CHeapObj<mtTracing> {
   void add(HeapWord* object, size_t size, traceid thread_id, bool virtual_thread, const JfrBlobHandle& bh, JavaThread* thread);
   void scavenge();
   void remove_dead(ObjectSample* sample);
+  void push_span(ObjectSample* sample, size_t span);
 
   const ObjectSample* item_at(int index) const;
   ObjectSample* item_at(int index);

src/java.base/share/classes/module-info.java

@@ -291,7 +291,6 @@
         java.security.jgss,
         jdk.naming.dns;
     exports sun.net.util to
-        java.desktop,
         java.net.http,
         jdk.jconsole,
         jdk.sctp;

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

@@ -25,10 +25,7 @@
 
 package sun.net.util;
 
-import java.io.IOException;
 import java.net.URL;
-import java.net.URLPermission;
-import java.security.Permission;
 import java.util.Locale;
 
 /**
@@ -87,27 +84,5 @@ public static String urlNoFragString(URL url) {
 
         return strForm.toString();
     }
-
-    public static Permission getConnectPermission(URL url) throws IOException {
-        String urlStringLowerCase = url.toString().toLowerCase(Locale.ROOT);
-        if (urlStringLowerCase.startsWith("http:") || urlStringLowerCase.startsWith("https:")) {
-            return getURLConnectPermission(url);
-        } else if (urlStringLowerCase.startsWith("jar:http:") || urlStringLowerCase.startsWith("jar:https:")) {
-            String urlString = url.toString();
-            int bangPos = urlString.indexOf("!/");
-            urlString = urlString.substring(4, bangPos > -1 ? bangPos : urlString.length());
-            @SuppressWarnings("deprecation")
-            URL u = new URL(urlString);
-            return getURLConnectPermission(u);
-            // If protocol is HTTP or HTTPS than use URLPermission object
-        } else {
-            return url.openConnection().getPermission();
-        }
-    }
-
-    private static Permission getURLConnectPermission(URL url) {
-        String urlString = url.getProtocol() + "://" + url.getAuthority() + url.getPath();
-        return new URLPermission(urlString);
-    }
 }
 

src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java

@@ -38,7 +38,6 @@
 import sun.awt.AppContext;
 
 import sun.lwawt.macosx.CPlatformWindow;
-import sun.reflect.misc.ReflectUtil;
 import sun.swing.SwingUtilities2;
 
 import com.apple.laf.AquaImageFactory.SlicedImageControl;
@@ -174,7 +173,6 @@ static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSing
         @SuppressWarnings("deprecation")
         T getInstance() {
             try {
-                ReflectUtil.checkPackageAccess(clazz);
                 return clazz.newInstance();
             } catch (ReflectiveOperationException ignored) {
             }

src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java

@@ -24,8 +24,6 @@
  */
 package com.sun.beans.finder;
 
-import static sun.reflect.misc.ReflectUtil.checkPackageAccess;
-
 /**
  * This is utility class that provides {@code static} methods
  * to find a class with the specified name using the specified class loader.
@@ -56,7 +54,6 @@ public final class ClassFinder {
      * @see Thread#getContextClassLoader()
      */
     public static Class<?> findClass(String name) throws ClassNotFoundException {
-        checkPackageAccess(name);
         try {
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
             if (loader == null) {
@@ -95,7 +92,6 @@ public static Class<?> findClass(String name) throws ClassNotFoundException {
      * @see Class#forName(String,boolean,ClassLoader)
      */
     public static Class<?> findClass(String name, ClassLoader loader) throws ClassNotFoundException {
-        checkPackageAccess(name);
         if (loader != null) {
             try {
                 return Class.forName(name, false, loader);

src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java

@@ -30,7 +30,6 @@
 import java.lang.reflect.Modifier;
 
 import static com.sun.beans.util.Cache.Kind.SOFT;
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
 
 /**
  * This utility class provides {@code static} methods
@@ -81,7 +80,7 @@ public static Constructor<?> findConstructor(Class<?> type, Class<?>...args) thr
             throw new NoSuchMethodException("Abstract class cannot be instantiated: "
                 + type.getName());
         }
-        if (!Modifier.isPublic(type.getModifiers()) || !isPackageAccessible(type)) {
+        if (!Modifier.isPublic(type.getModifiers())) {
             throw new NoSuchMethodException("Class is not accessible: " + type.getName());
         }
         PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);

src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java

@@ -27,8 +27,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
 /**
  * This utility class provides {@code static} methods
  * to find a public field with specified name
@@ -62,7 +60,7 @@ public static Field findField(Class<?> type, String name) throws NoSuchFieldExce
             throw new NoSuchFieldException("Field '" + name + "' is not public");
         }
         type = field.getDeclaringClass();
-        if (!Modifier.isPublic(type.getModifiers()) || !isPackageAccessible(type)) {
+        if (!Modifier.isPublic(type.getModifiers())) {
             throw new NoSuchFieldException("Field '" + name + "' is not accessible");
         }
         return field;

src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java

@@ -34,7 +34,6 @@
 import java.util.Arrays;
 
 import static com.sun.beans.util.Cache.Kind.SOFT;
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
 
 /**
  * This utility class provides {@code static} methods
@@ -79,7 +78,7 @@ public static Method findMethod(Class<?> type, String name, Class<?>...args) thr
 
         try {
             Method method = CACHE.get(signature);
-            return (method == null) || isPackageAccessible(method.getDeclaringClass()) ? method : CACHE.create(signature);
+            return (method == null) ? method : CACHE.create(signature);
         }
         catch (SignatureException exception) {
             throw exception.toNoSuchMethodException("Method '" + name + "' is not found");
@@ -138,7 +137,7 @@ public static Method findAccessibleMethod(Method method) throws NoSuchMethodExce
         if (!FinderUtils.isExported(type)) {
             throw new NoSuchMethodException("Method '" + method.getName() + "' is not accessible");
         }
-        if (Modifier.isPublic(type.getModifiers()) && isPackageAccessible(type)) {
+        if (Modifier.isPublic(type.getModifiers())) {
             return method;
         }
         if (Modifier.isStatic(method.getModifiers())) {

src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java

@@ -31,8 +31,6 @@
 
 import com.sun.beans.util.Cache;
 
-import static sun.reflect.misc.ReflectUtil.checkPackageAccess;
-
 public final class ClassInfo {
     private static final ClassInfo DEFAULT = new ClassInfo(null);
     private static final Cache<Class<?>,ClassInfo> CACHE
@@ -48,7 +46,6 @@ public static ClassInfo get(Class<?> type) {
             return DEFAULT;
         }
         try {
-            checkPackageAccess(type);
             return CACHE.get(type);
         } catch (SecurityException exception) {
             return DEFAULT;