8276825: hotspot/runtime/SelectionResolution test errors

Reviewed-by: dholmes, shade

Author: Harold Seigel

test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -112,7 +112,7 @@ private void addHelperMethod(int classId) {
         int packageId = classdata.get(classId).packageId.ordinal();
         Clazz C = helpers[packageId];
         if (C == null) {
-            C = new Clazz(getPackageName(packageId) + "Helper", -1, ACC_PUBLIC);
+            C = new Clazz(getPackageName(packageId) + "Helper", ACC_PUBLIC, -1);
             helpers[packageId] = C;
             classes.add(C);
         }

test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -69,7 +69,7 @@ public Clazz(String name, String extending, int access, int index, String... imp
      * @param implementing Interfaces implemented
      */
     public Clazz(String name, String extending, int access, int classFileVersion, int index, String... implementing) {
-        super(name, extending == null ? "java/lang/Object" : extending, access + ACC_SUPER, classFileVersion, index, implementing);
+        super(name, extending == null ? "java/lang/Object" : extending, access | ACC_SUPER, classFileVersion, index, implementing);
         // Add the default constructor
         addMethod("<init>", "()V", ACC_PUBLIC).makeConstructor(extending, false);
     }

test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -36,7 +36,7 @@ public TestBuilder(int classId, SelectionResolutionTestCase testcase) {
         super(testcase);
 
         // Make a public class Test that contains all our test methods
-        testClass = new Clazz("Test", null, -1, ACC_PUBLIC);
+        testClass = new Clazz("Test", null, ACC_PUBLIC, -1);
 
         // Add a main method
         mainMethod = testClass.addMethod("main", "([Ljava/lang/String;)V", ACC_PUBLIC + ACC_STATIC);