Skip to content

Commit

Permalink
8271826: mark hotspot runtime/condy tests which ignore external VM flags
Browse files Browse the repository at this point in the history 
Reviewed-by: jiefu
  • Loading branch information
@iignatev
iignatev committed Aug 4, 2021
1 parent 3435d29 commit d3b40cb
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/runtime/condy/BadBSMUseTest.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
Expand All @@ -25,6 +25,7 @@
* @test
* @bug 8186211
* @summary CONSTANT_Dynamic_info structure's tries to use a BSM index whose signature is for an invokedynamic and vice versa.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile CondyUsesIndyBSM.jcod
Expand Down
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/runtime/condy/CondyLDCTest.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
Expand All @@ -25,6 +25,7 @@
* @test
* @bug 8186211
* @summary Tests various ldc, ldc_w, ldc2_w instructions of CONSTANT_Dynamic.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile CondyUseLDC_W.jasm
Expand Down
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/runtime/condy/CondyNewInvokeSpecialTest.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
Expand All @@ -25,6 +25,7 @@
* @test
* @bug 8186211
* @summary Test CONSTANT_Dynamic where the BSM is invoked via a REF_newInvokeSpecial.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile CondyNewInvokeSpecial.jasm
Expand Down
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/runtime/condy/escapeAnalysis/TestEscapeCondy.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 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
Expand All @@ -26,6 +26,7 @@
* @bug 8216970
* @summary Ensure escape analysis can handle an ldc of a dynamic
* constant whose return type is an array of boolean.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile TestEscapeThroughInvokeWithCondy$A.jasm
Expand Down
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/runtime/condy/staticInit/TestInitException.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 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
Expand All @@ -25,6 +25,7 @@
* @test
* @bug 8228485
* @summary Correctly handle initialization error for Condy BSM.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile Example.jasm
Expand Down

3 comments on commit d3b40cb

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on d3b40cb Oct 30, 2023

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 d3b40cb Oct 30, 2023

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-d3b40cb6 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 d3b40cb6 from the openjdk/jdk repository.

The commit being backported was authored by Igor Ignatyev on 4 Aug 2021 and was reviewed by Jie Fu.

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.git GoeLin-backport-d3b40cb6:GoeLin-backport-d3b40cb6
$ git checkout GoeLin-backport-d3b40cb6
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-d3b40cb6

Please sign in to comment.