Skip to content
Permalink
Browse files
8276825: hotspot/runtime/SelectionResolution test errors
Backport-of: 55b36c6f3bb7eb066daaf41f9eba46633afedf08
  • Loading branch information
GoeLin committed Mar 11, 2022
1 parent 972dcde commit 79cce169d4618e689698cedbb5eeae840fb3fe22
Showing 3 changed files with 6 additions and 6 deletions.
@@ -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);
}
@@ -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);
}
@@ -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);

1 comment on commit 79cce16

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 79cce16 Mar 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.