Bug 37836205 - [37834715->25.03.1] Update PortableTypeGenerator to use ClassReaderInternal instead of ClassReader (merge ce/main -> ce/25.03 @ 115630)

rlubke · rlubke · commit 444f5fc4c84a · 2025-04-15T21:40:44.000-05:00
[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v25.03/": change = 115631]
diff --git a/prj/coherence-core/src/main/java/com/tangosol/internal/asm/ClassReaderInternal.java b/prj/coherence-core/src/main/java/com/tangosol/internal/asm/ClassReaderInternal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -48,12 +48,20 @@ public ClassReaderInternal(byte[] abBytes)
         super(abBytes);
         }
 
+    /**
+     * @see BaseClassReaderInternal#BaseClassReaderInternal(byte[], int, int)
+     */
+    public ClassReaderInternal(byte[] abBytes, int cOffset, int cLength)
+        {
+        super(abBytes, cOffset, cLength);
+        }
+
     // ----- BaseClassReaderInternal methods --------------------------------
 
     @Override
-    protected ClassReader createReader(byte[] abBytes)
+    protected ClassReader createReader(byte[] abBytes, int cOffset, int cLength)
         {
-        return new ClassReader(abBytes);
+        return new ClassReader(abBytes, cOffset, cLength);
         }
 
     @Override
diff --git a/prj/coherence-core/src/main/java/com/tangosol/io/pof/generator/PortableTypeGenerator.java b/prj/coherence-core/src/main/java/com/tangosol/io/pof/generator/PortableTypeGenerator.java
@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
  */
 package com.tangosol.io.pof.generator;
 
+import com.tangosol.internal.asm.ClassReaderInternal;
+
 import com.tangosol.io.pof.RawDate;
 import com.tangosol.io.pof.RawDateTime;
 import com.tangosol.io.pof.RawDayTimeInterval;
@@ -170,7 +172,7 @@ public PortableTypeGenerator(Schema schema, InputStream in, boolean fDebug)
     public PortableTypeGenerator(Schema schema, InputStream in, boolean fDebug, Logger logger)
             throws IOException
         {
-        this(schema, new ClassReader(in), fDebug, logger);
+        this(schema, new ClassReaderInternal(in), fDebug, logger);
         }
 
     /**
@@ -185,7 +187,7 @@ public PortableTypeGenerator(Schema schema, InputStream in, boolean fDebug, Logg
      */
     public PortableTypeGenerator(Schema schema, byte[] bytes, int nOffset, int nLen, boolean fDebug, Logger logger)
         {
-        this(schema, new ClassReader(bytes, nOffset, nLen), fDebug, logger);
+        this(schema, new ClassReaderInternal(bytes, nOffset, nLen), fDebug, logger);
         }
 
     /**
@@ -215,6 +217,35 @@ public PortableTypeGenerator(Schema schema, ClassReader reader, boolean fDebug,
             }
         }
 
+    /**
+     * Create a {@link PortableTypeGenerator}.
+     *
+     * @param schema  the {@link Schema} instance to use
+     * @param reader  the {@link ClassReaderInternal} containing the class to instrument
+     * @param fDebug  flag indicating whether to generate debug code
+     * @param logger  the {@link Logger} to use
+     *
+     * @since 25.03.1
+     */
+    protected PortableTypeGenerator(Schema schema, ClassReaderInternal reader, boolean fDebug, Logger logger)
+        {
+        m_schema = schema;
+        m_fDebug = fDebug;
+        m_log    = logger;
+
+        ClassNode cn = new ClassNode();
+
+        reader.accept(cn, 0);
+
+        m_classNode = cn;
+
+        com.oracle.coherence.common.schema.Type<?, ?> type = m_schema.findTypeByJavaName(javaName(cn.name));
+        if (type != null)
+            {
+            m_type = (PofType) type.getExtension(PofType.class);
+            }
+        }
+
     // ----- PortableTypeGenerator methods ----------------------------------
 
     /**
diff --git a/prj/coherence-core/src/main/java/com/tangosol/util/asm/BaseClassReaderInternal.java b/prj/coherence-core/src/main/java/com/tangosol/util/asm/BaseClassReaderInternal.java
@@ -36,8 +36,20 @@ public BaseClassReaderInternal(InputStream streamIn)
      * @see org.objectweb.asm.ClassReader#ClassReader(byte[])
      */
     public BaseClassReaderInternal(byte[] abBytes)
+        {
+        this(abBytes, 0, abBytes.length);
+        }
+
+    /**
+     * @see org.objectweb.asm.ClassReader#ClassReader(byte[], int, int)
+     *
+     * @since 25.03.1
+     */
+    public BaseClassReaderInternal(byte[] abBytes, int cOffset, int cLength)
         {
         m_abBytes = abBytes;
+        m_cOffset = cOffset;
+        m_cLength = cLength;
         }
 
     // ----- abstract methods -----------------------------------------------
@@ -46,10 +58,12 @@ public BaseClassReaderInternal(byte[] abBytes)
      * Create the module-specific ClassReader.
      *
      * @param abBytes  the class bytes
+     * @param cOffset  the starting offset
+     * @param cLength  the class length
      *
      * @return the module-specific ClassReader
      */
-    protected abstract RT createReader(byte[] abBytes);
+    protected abstract RT createReader(byte[] abBytes, int cOffset, int cLength);
 
     /**
      * Perform the accept operation on the module-specific ClassReader
@@ -88,7 +102,7 @@ public void accept(CVT classVisitor, int nParsingOptions)
             Logger.warn(() -> String.format("Unsupported class file major version " + nOriginalVersion));
             }
 
-        RT classReader = createReader(abBytes);
+        RT classReader = createReader(abBytes, m_cOffset, m_cLength);
 
         if (fRevertVersion)
             {
@@ -144,4 +158,18 @@ protected static int getMajorVersion(final byte[] abBytes)
      * The class bytes.
      */
     protected byte[] m_abBytes;
+
+    /**
+     * The offset within {@link #m_abBytes} the class starts.
+     *
+     * @since 25.03.1
+     */
+    protected int m_cOffset;
+
+    /**
+     * The total number of bytes of the class.
+     *
+     * @since 25.03.1
+     */
+    protected int m_cLength;
     }
diff --git a/prj/coherence-json/src/main/java/com/oracle/coherence/io/json/genson/reflect/ASMCreatorParameterNameResolver.java b/prj/coherence-json/src/main/java/com/oracle/coherence/io/json/genson/reflect/ASMCreatorParameterNameResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates.
  *
  * Copyright 2011-2014 Genson - Cepoi Eugen
  *
@@ -34,7 +34,7 @@
  * This class uses ASM library to resolve method and constructor parameter names from debug symbols
  * generated during compilation. Most libraries are compiled with debug symbols so in most cases
  * this class will be able to resolve them. It's pretty cool as you do not need to annotate the
- * parameters anymore! However be careful if you decide to use this feature, you must ensure that
+ * parameters anymore! However, be careful if you decide to use this feature, you must ensure that
  * your software is compiled with debug symbols for production! That's why this feature is disabled
  * by default. To enable it :
  * <p/>
@@ -367,12 +367,20 @@ public ClassReaderInternal(byte[] abBytes)
       super(abBytes);
       }
 
+    /**
+     * @see BaseClassReaderInternal#BaseClassReaderInternal(byte[], int, int)
+     */
+    public ClassReaderInternal(byte[] abBytes, int cOffset, int cLength)
+      {
+      super(abBytes, cOffset, cLength);
+      }
+
     // ----- BaseClassReaderInternal methods --------------------------------
 
     @Override
-    protected ClassReader createReader(byte[] abBytes)
+    protected ClassReader createReader(byte[] abBytes, int cOffset, int cLength)
       {
-      return new ClassReader(abBytes);
+      return new ClassReader(abBytes, cOffset, cLength);
       }
 
     @Override
diff --git a/prj/coherence-rest/src/main/java/com/tangosol/coherence/rest/util/PartialObject.java b/prj/coherence-rest/src/main/java/com/tangosol/coherence/rest/util/PartialObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -733,12 +733,20 @@ public ClassReaderInternal(byte[] abBytes)
             super(abBytes);
             }
 
+        /**
+         * @see BaseClassReaderInternal#BaseClassReaderInternal(byte[], int, int)
+         */
+        public ClassReaderInternal(byte[] abBytes, int cOffset, int cLength)
+            {
+            super(abBytes, cOffset, cLength);
+            }
+
         // ----- BaseClassReaderInternal methods --------------------------------
 
         @Override
-        protected ClassReader createReader(byte[] abBytes)
+        protected ClassReader createReader(byte[] abBytes, int cOffset, int cLength)
             {
-            return new ClassReader(abBytes);
+            return new ClassReader(abBytes, cOffset, cLength);
             }
 
         @Override
