Skip to content
Permalink
Browse files
8276825: hotspot/runtime/SelectionResolution test errors
Reviewed-by: dholmes, shade
  • Loading branch information
Harold Seigel committed Nov 10, 2021
1 parent 0f23c6a commit 55b36c6f3bb7eb066daaf41f9eba46633afedf08
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);

3 comments on commit 55b36c6

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 55b36c6 Nov 10, 2021

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 55b36c6 Mar 10, 2022

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 55b36c6 Mar 10, 2022

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-55b36c6f in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 55b36c6f from the openjdk/jdk repository.

The commit being backported was authored by Harold Seigel on 10 Nov 2021 and was reviewed by David Holmes and Aleksey Shipilev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-55b36c6f:GoeLin-backport-55b36c6f
$ git checkout GoeLin-backport-55b36c6f
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-55b36c6f

Please sign in to comment.