Merge branch 'upstream_master'

.gitlab-ci.yml

@@ -18,4 +18,4 @@ build:
     - $GRADLE test jacocoTestCoverageVerification
     - if [ $NEXUS_USER_NAME ]; then $GRADLE publish; fi
     - if [ !$NEXUS_USER_NAME ]; then $GRADLE publishToMavenLocal; fi
-    - '$GRADLE jacocoTestReport sonarqube -Dsonar.host.url=$SONAR'
+    - '$GRADLE jacocoTestReport sonarqube -Dsonar.host.url=$SONAR -Dsonar.login=${SONAR_LOGIN}'

asm-util/src/main/java/org/objectweb/asm/util/CheckClassAdapter.java

@@ -1114,7 +1114,11 @@ public class CheckClassAdapter extends ClassVisitor {
       if (name.charAt(endIndex - 1) == ';') {
         endIndex--;
       }
-      return name.substring(lastSlashIndex + 1, endIndex);
+      int lastBracketIndex = name.lastIndexOf('[');
+      if (lastBracketIndex == -1) {
+        return name.substring(lastSlashIndex + 1, endIndex);
+      }
+      return name.substring(0, lastBracketIndex + 1) + name.substring(lastSlashIndex + 1, endIndex);
     }
   }
 }

asm-util/src/test/java/org/objectweb/asm/util/CheckClassAdapterTest.java

@@ -549,6 +549,7 @@ public class CheckClassAdapterTest extends AsmTest implements Opcodes {
     String log = logger.toString();
     assertFalse(log.startsWith(AnalyzerException.class.getName() + ": Error at instruction"));
     assertTrue(log.contains("00000 CheckClassAdapterTest  :  :     ALOAD 0"));
+    assertTrue(log.contains("00001 CheckClassAdapterTest [Object  : [Object  :     ARETURN"));
   }
 
   @Test
@@ -578,4 +579,8 @@ public class CheckClassAdapterTest extends AsmTest implements Opcodes {
   private static Attribute[] attributes() {
     return new Attribute[] {new Comment(), new CodeComment()};
   }
+
+  Object methodWithObjectArrayArgument(final Object[] arg) {
+    return arg;
+  }
 }

build.gradle

@@ -209,7 +209,7 @@ subprojects {
 // and uploaded to Maven with a POM, sources and Javadoc.
 configure(subprojects.findAll { it.provides }) {
   // Code coverage configuration.
-  jacoco.toolVersion = '0.8.6'
+  jacoco.toolVersion = '0.8.7'
   jacocoTestReport {
     reports { xml.enabled true }
     classDirectories.setFrom(sourceSets.main.output.classesDirs)