Skip to content

Commit 4189ba1

Browse files
committed
Tweak test to work with latest source version
1 parent 2bd99e0 commit 4189ba1

File tree

2 files changed

+60
-10
lines changed

2 files changed

+60
-10
lines changed
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
25+
26+
/*
27+
* @test
28+
* @bug 8361481
29+
* @modules jdk.compiler
30+
* @summary Flexible Constructor Bodies generates a compilation error when compiling a user supplied java.lang.Object class
31+
*/
32+
33+
import java.io.*;
34+
import java.util.*;
35+
36+
public class T8361481 {
37+
static String testSrc = System.getProperty("test.src", ".");
38+
39+
public static void main(String... args) throws Exception {
40+
new T8361481().run();
41+
}
42+
43+
public void run() throws Exception {
44+
// compile modified Object.java, using patch-module to avoid errors
45+
File x = new File(testSrc, "x");
46+
String[] jcArgs = { "-d", ".", "--patch-module", "java.base=" + x.getAbsolutePath(),
47+
new File(new File(new File(x, "java"), "lang"), "Object.java").getPath()};
48+
compile(jcArgs);
49+
}
50+
51+
void compile(String... args) {
52+
int rc = com.sun.tools.javac.Main.compile(args);
53+
if (rc != 0)
54+
throw new Error("javac failed: " + Arrays.asList(args) + ": " + rc);
55+
}
56+
}
57+

test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java renamed to test/langtools/tools/javac/ObjectEarlyContext/x/java/lang/Object.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,12 @@
2121
* questions.
2222
*/
2323

24-
/*
25-
* @test
26-
* @bug 8361481
27-
* @summary Flexible Constructor Bodies generates a compilation error when compiling a user supplied java.lang.Object class
28-
* @compile -source 8 Object.java
29-
*/
30-
3124
package java.lang;
3225

3326
public class Object {
34-
int x;
35-
3627
public Object() {
37-
x = 2;
28+
foo(); // valid, not in early constructor context
3829
}
30+
31+
void foo() { }
3932
}

0 commit comments

Comments
 (0)