stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8276825: hotspot/runtime/SelectionResolution test errors

Browse Source 
Reviewed-by: dholmes, shade
This commit is contained in:
Harold Seigel 2021-11-10 13:11:16 +00:00
parent 0f23c6a9fe
commit 55b36c6f3b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -112,7 +112,7 @@ public class ClassBuilder extends Builder {
int packageId = classdata.get(classId).packageId.ordinal(); int packageId = classdata.get(classId).packageId.ordinal();
Clazz C = helpers[packageId]; Clazz C = helpers[packageId];
if (C == null) { if (C == null) {
C = new Clazz(getPackageName(packageId) + "Helper", -1, ACC_PUBLIC); C = new Clazz(getPackageName(packageId) + "Helper", ACC_PUBLIC, -1);
helpers[packageId] = C; helpers[packageId] = C;
classes.add(C); classes.add(C);
} }

4
test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -69,7 +69,7 @@ class Clazz extends ClassConstruct {
* @param implementing Interfaces implemented * @param implementing Interfaces implemented
*/ */
public Clazz(String name, String extending, int access, int classFileVersion, int index, String... implementing) { 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 // Add the default constructor
addMethod("<init>", "()V", ACC_PUBLIC).makeConstructor(extending, false); addMethod("<init>", "()V", ACC_PUBLIC).makeConstructor(extending, false);
} }

4
test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -36,7 +36,7 @@ class TestBuilder extends Builder {
super(testcase); super(testcase);
// Make a public class Test that contains all our test methods // 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 // Add a main method
mainMethod = testClass.addMethod("main", "([Ljava/lang/String;)V", ACC_PUBLIC + ACC_STATIC); mainMethod = testClass.addMethod("main", "([Ljava/lang/String;)V", ACC_PUBLIC + ACC_STATIC);