Skip to content

Commit 9423a9e

Browse files
dougxcdougxc
committed
[GR-10195] Adopt libgraal JVMCI API changes.
PullRequest: graal/1617
2 parents 80a90ba + 49889ce commit 9423a9e

File tree

166 files changed

+915
-897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+915
-897
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jdk:
1818

1919
env:
2020
global:
21-
- JVMCI_VERSION="jvmci-0.45"
21+
- JVMCI_VERSION="jvmci-0.46"
2222
- JDK8_UPDATE_VERSION="172"
2323
matrix:
2424
- JDK="jdk8" GATE="style,fullbuild"

‎common.hocon‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ overlay = 1deeaf6e01f16b72271b066cfc8d73d8ab3977d9
66
# openjdk8 JDKs on Linux are built by Oracle Labs
77
# openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
88
jdks: {
9-
labsjdk8: {name : labsjdk, version : "8u172-jvmci-0.45", platformspecific: true}
10-
openjdk8: {name : openjdk, version : "8u172-jvmci-0.45", platformspecific: true}
11-
labsjdk8Debug: {name : labsjdk, version : "8u172-jvmci-0.45-fastdebug", platformspecific: true}
12-
oraclejdk9: {name : oraclejdk, version : "9.0.4+11", platformspecific: true}
13-
oraclejdk10: {name : oraclejdk, version : "10+46", platformspecific: true}
9+
labsjdk8: {name : labsjdk, version : "8u172-jvmci-0.46", platformspecific: true}
10+
openjdk8: {name : openjdk, version : "8u172-jvmci-0.46", platformspecific: true}
11+
labsjdk8Debug: {name : labsjdk, version : "8u172-jvmci-0.46-fastdebug", platformspecific: true}
12+
oraclejdk11: {name : oraclejdk, version : "11+20", platformspecific: true}
1413

1514
# Snapshot of http://hg.openjdk.java.net/jdk/jdk
16-
oraclejdkSNAPSHOT : {name : labsjdk, version : "20180618-110011", platformspecific: true}
15+
oraclejdkSNAPSHOT : {name : labsjdk, version : "20180629-011203", platformspecific: true}
1716

1817
}
1918

@@ -25,14 +24,12 @@ mx : {
2524
}
2625
}
2726

28-
labsjdk8 : { downloads : { JAVA_HOME : ${jdks.labsjdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk9} ]} }}
29-
labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk9} ]} }}
27+
labsjdk8 : { downloads : { JAVA_HOME : ${jdks.labsjdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
28+
labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
3029

3130
openjdk8 : { downloads : { JAVA_HOME : ${jdks.openjdk8} }}
3231

33-
oraclejdk9 : { downloads : { JAVA_HOME : ${jdks.oraclejdk9}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }}
34-
oraclejdk10 : { downloads : { JAVA_HOME : ${jdks.oraclejdk10}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8}, ${jdks.oraclejdk9} ]} }}
35-
oraclejdk11 : { downloads : { JAVA_HOME : ${jdks.oraclejdkSNAPSHOT}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8}, ${jdks.oraclejdk10} ]} }}
32+
oraclejdk11 : { downloads : { JAVA_HOME : ${jdks.oraclejdk11}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }}
3633

3734
common : ${mx} {
3835
timelimit : "30:00"

‎compiler/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ git clone https://github.com/graalvm/mx.git
2121
export PATH=$PWD/mx:$PATH
2222
```
2323

24-
Graal depends on a JDK that supports JVMCI ([JVM Compiler Interface](https://bugs.openjdk.java.net/browse/JDK-8062493)). There is a JVMCI
25-
[port](https://github.com/graalvm/graal-jvmci-8) for JDK 8 and JVMCI is built into the JDK as of JDK 9.
24+
Graal depends on a JDK that supports a compatible version of JVMCI ([JVM Compiler Interface](https://bugs.openjdk.java.net/browse/JDK-8062493)). There is a JVMCI
25+
[port](https://github.com/graalvm/graal-jvmci-8) for JDK 8 and the required JVMCI version is built into the JDK as of JDK 11-ea+20.
2626

2727
Graal currently requires a JVMCI-enabled JDK 8 (download from [OTN](http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html) or [build](#building-jvmci-jdk8) yourself) and will do so until all JDK 8 specific Graal code is factored out as [versioned sources](https://github.com/graalvm/mx#versioning-sources-for-different-jdk-releases).
2828
Developing versioned sources specific to other JDKs requires them to be made
29-
available on the `EXTRA_JAVA_HOMES` environment variable. At the time of writing, this means JDK 9
30-
and JDK 11 ([early access builds](http://jdk.java.net/11/) should work but a build from
29+
available on the `EXTRA_JAVA_HOMES` environment variable. At the time of writing, this
30+
JDK 11-ea+20 ([early access build](http://jdk.java.net/11/) should work but a build from
3131
the [latest bits](http://hg.openjdk.java.net/jdk/jdk/) is required if Graal targets features not yet in an early access build).
3232

3333
Here is a typical set up for specifying multiple JDKs on Linux:
3434
```
3535
export JAVA_HOME=/usr/lib/jvm/labsjdk1.8.0_172-jvmci-0.44
36-
export EXTRA_JAVA_HOMES=/usr/lib/jvm/jdk-9.0.4:/usr/lib/jvm/jdk-11
36+
export EXTRA_JAVA_HOMES=/usr/lib/jvm/jdk-11
3737
```
3838
And on macOS:
3939
```
4040
export JAVA_HOME=/Library/Java/JavaVirtualMachines/labsjdk1.8.0_172-jvmci-0.44/Contents/Home
41-
export EXTRA_JAVA_HOMES=/Library/Java/JavaVirtualMachines/jdk-9.0.4.jdk/Contents/Home:/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home
41+
export EXTRA_JAVA_HOMES=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home
4242
```
4343
If you omit `EXTRA_JAVA_HOMES`, the associated sources will not be built. Note that `JAVA_HOME` defines the *primary* JDK for development. For instance, when running `mx vm`, this is the JDK that will be used so if you want to run on JDK 11, swap JDK 8 and JDK 11 in `JAVA_HOME` and `EXTRA_JAVA_HOMES`.
4444

‎compiler/ci_common/gate_tasks.hocon‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,17 @@ builds += [
44
# Darwin AMD64
55
${gateTest} ${labsjdk8} ${gateDarwinAMD64} {name: "weekly-test-compiler-test-8-darwin-amd64"} ${graalWeekly}
66
${gateTest} ${openjdk8} ${gateDarwinAMD64} {name: "weekly-test-compiler-test-openjdk8-darwin-amd64"} ${graalWeekly}
7-
${gateTest} ${oraclejdk9} ${gateDarwinAMD64} {name: "weekly-test-compiler-test-9-darwin-amd64"} ${graalWeekly}
8-
${gateTest} ${oraclejdk10} ${gateDarwinAMD64} {name: "weekly-test-compiler-test-10-darwin-amd64"} ${graalWeekly}
97
${gateTest} ${oraclejdk11} ${gateDarwinAMD64} {name: "weekly-test-compiler-test-11-darwin-amd64"} ${graalWeekly}
108
# ${gateTestBenchmark} ${labsjdk8} ${gateDarwinAMD64} {name: "weekly-test-compiler-benchmarktest-8-darwin-amd64"} ${graalWeekly}
119

1210
# Linux AMD64
1311
${gateTest} ${labsjdk8} ${gateLinuxAMD64} {name: "gate-compiler-test-8-linux-amd64"}
1412
${gateTest} ${openjdk8} ${gateLinuxAMD64} {name: "weekly-test-compiler-test-openjdk8-linux-amd64"} ${graalWeekly}
1513
${gateTestMaxVS} ${labsjdk8} ${gateLinuxAMD64} {name: "weekly-test-compiler-test-8-linux-amd64-maxvectorsize"} ${graalWeekly}
16-
${gateTest} ${oraclejdk9} ${gateLinuxAMD64} {name: "weekly-test-compiler-test-9-linux-amd64"} ${graalWeekly} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
17-
${gateTest} ${oraclejdk10} ${gateLinuxAMD64} {name: "weekly-test-compiler-test-10-linux-amd64"} ${graalWeekly} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
1814
${gateTest} ${oraclejdk11} ${gateLinuxAMD64} {name: "gate-compiler-test-11-linux-amd64"} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
1915
${gateJavaBaseTest} ${oraclejdk11} ${gateLinuxAMD64} {name: "weekly-test-compiler-javabasetest-11-linux-amd64"} ${graalWeekly} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
2016
${gateTestCTW} ${labsjdk8} ${gateLinuxAMD64} {name: "gate-compiler-ctw-8-linux-amd64"}
2117
${gateTestCTW} ${openjdk8} ${gateLinuxAMD64} {name: "weekly-test-compiler-ctw-openjdk8-linux-amd64"} ${graalWeekly}
22-
${gateTestCTW} ${oraclejdk9} ${gateLinuxAMD64} {name: "weekly-test-compiler-ctw-9-linux-amd64"} ${graalWeekly}
23-
${gateTestCTW} ${oraclejdk10} ${gateLinuxAMD64} {name: "weekly-test-compiler-ctw-10-linux-amd64"} ${graalWeekly}
2418
${gateTestCTW} ${oraclejdk11} ${gateLinuxAMD64} {name: "weekly-test-compiler-ctw-11-linux-amd64"} ${graalWeekly}
2519
${gateTest} ${labsjdk8Debug} ${gateLinuxAMD64} {name: "weekly-test-compiler-test-8-linux-amd64-fastdebug", timelimit: "1:50:00"} ${graalWeekly}
2620
${gateTestBenchmark} ${labsjdk8} ${gateLinuxAMD64} {name: "gate-compiler-benchmarktest-8-linux-amd64"}
@@ -29,12 +23,8 @@ builds += [
2923

3024
# Solaris SPARC
3125
${gateTest} ${labsjdk8} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9", timelimit: "1:00:00"}
32-
${gateTest} ${oraclejdk9} ${gateSolarisSPARC} {name: "weekly-test-compiler-test-9-solaris-sparcv9", timelimit: "1:50:00"} ${graalWeekly}
33-
${gateTest} ${oraclejdk10} ${gateSolarisSPARC} {name: "weekly-test-compiler-test-10-solaris-sparcv9", timelimit: "1:50:00"} ${graalWeekly}
3426
${gateTest} ${oraclejdk11} ${gateSolarisSPARC} {name: "gate-compiler-test-11-solaris-sparcv9", timelimit: "1:00:00"}
3527
${gateTestCTW} ${labsjdk8} ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9", timelimit: "1:00:00"}
36-
${gateTestCTW} ${oraclejdk9} ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-9-solaris-sparcv9", timelimit: "1:50:00"} ${graalWeekly}
37-
${gateTestCTW} ${oraclejdk10} ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-10-solaris-sparcv9", timelimit: "1:50:00"} ${graalWeekly}
3828
${gateTestCTW} ${oraclejdk11} ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-11-solaris-sparcv9", timelimit: "1:50:00"} ${graalWeekly}
3929
${gateTest} ${labsjdk8Debug} ${gateSolarisSPARC} {name: "weekly-test-compiler-test-8-solaris-sparcv9-fastdebug", timelimit: "1:50:00"} ${graalWeekly}
4030
${gateTestBenchmark} ${labsjdk8} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9", timelimit: "1:00:00"}

‎compiler/ci_common/gate_tasks_bootstrap.hocon‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,16 @@
22
builds += [
33
# Darwin AMD64
44
${gateBootstrapLite} ${labsjdk8} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-8-darwin-amd64"}
5-
${gateBootstrapLite} ${oraclejdk9} ${gateDarwinAMD64Bootstrap} {name: "weekly-test-compiler-bootstraplite-9-darwin-amd64"} ${graalWeekly}
6-
${gateBootstrapLite} ${oraclejdk10} ${gateDarwinAMD64Bootstrap} {name: "weekly-test-compiler-bootstraplite-10-darwin-amd64"} ${graalWeekly}
75
${gateBootstrapLite} ${oraclejdk11} ${gateDarwinAMD64Bootstrap} {name: "weekly-test-compiler-bootstraplite-11-darwin-amd64"} ${graalWeekly}
86

97
# Linux AMD64
108
${gateBootstrap} ${labsjdk8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-8-linux-amd64"}
119
${gateBootstrapFullVerify} ${labsjdk8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrapfullverify-8-linux-amd64"}
12-
${gateBootstrap} ${oraclejdk9} ${gateLinuxAMD64Bootstrap} {name: "weekly-test-compiler-bootstrap-9-linux-amd64"} ${graalWeekly}
13-
${gateBootstrap} ${oraclejdk10} ${gateLinuxAMD64Bootstrap} {name: "weekly-test-compiler-bootstrap-10-linux-amd64"} ${graalWeekly}
1410
${gateBootstrap} ${oraclejdk11} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-11-linux-amd64"}
1511

1612
# Solaris SPARC
1713
${gateBootstrap} ${labsjdk8} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-8-solaris-sparcv9", timelimit: "1:00:00"}
18-
${gateBootstrap} ${oraclejdk9} ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-9-solaris-sparcv9", timelimit: "1:00:00"} ${graalWeekly}
19-
${gateBootstrap} ${oraclejdk10} ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-10-solaris-sparcv9", timelimit: "1:00:00"} ${graalWeekly}
14+
${gateBootstrap} ${oraclejdk11} ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-11-solaris-sparcv9", timelimit: "1:00:00"} ${graalWeekly}
2015

2116
# Linux SPARC
2217
${gateBootstrap} ${labsjdk8} ${gateLinuxSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-labsjdk8-linux-sparcv9", timelimit: "1:00:00"} ${graalWeekly}

‎compiler/mx.compiler/suite.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,6 @@
12561256
"jdk.tools.jaotc.binformat",
12571257
"org.graalvm.compiler.asm.amd64",
12581258
"org.graalvm.compiler.asm.aarch64",
1259-
"org.graalvm.compiler.hotspot",
12601259
],
12611260

12621261
"checkstyle" : "org.graalvm.compiler.graph",

‎compiler/src/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -139,22 +139,22 @@ public final class BinaryContainer implements SymbolTable {
139139
*/
140140
private static final HashMap<String, String> functionNamesToAOTSymbols = new HashMap<>();
141141

142+
//@formatter:off
142143
private static final String[][] map = {
143-
//@formatter:off
144-
{"CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", "_aot_deopt_blob_unpack"},
145-
{"CompilerToVM::Data::SharedRuntime_deopt_blob_uncommon_trap", "_aot_deopt_blob_uncommon_trap"},
146-
{"CompilerToVM::Data::SharedRuntime_ic_miss_stub", "_aot_ic_miss_stub"},
147-
{"CompilerToVM::Data::SharedRuntime_handle_wrong_method_stub", "_aot_handle_wrong_method_stub"},
148-
{"SharedRuntime::exception_handler_for_return_address", "_aot_exception_handler_for_return_address"},
149-
{"SharedRuntime::register_finalizer", "_aot_register_finalizer"},
150-
{"SharedRuntime::OSR_migration_end", "_aot_OSR_migration_end"},
151-
{"CompilerRuntime::resolve_dynamic_invoke", "_aot_resolve_dynamic_invoke"},
152-
{"CompilerRuntime::resolve_string_by_symbol", "_aot_resolve_string_by_symbol"},
153-
{"CompilerRuntime::resolve_klass_by_symbol", "_aot_resolve_klass_by_symbol"},
154-
{"CompilerRuntime::resolve_method_by_symbol_and_load_counters","_aot_resolve_method_by_symbol_and_load_counters"},
155-
{"CompilerRuntime::initialize_klass_by_symbol", "_aot_initialize_klass_by_symbol"},
156-
{"CompilerRuntime::invocation_event", "_aot_invocation_event"},
157-
{"CompilerRuntime::backedge_event", "_aot_backedge_event"},
144+
{"CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", "_aot_deopt_blob_unpack"},
145+
{"CompilerToVM::Data::SharedRuntime_deopt_blob_uncommon_trap", "_aot_deopt_blob_uncommon_trap"},
146+
{"CompilerToVM::Data::SharedRuntime_ic_miss_stub", "_aot_ic_miss_stub"},
147+
{"CompilerToVM::Data::SharedRuntime_handle_wrong_method_stub", "_aot_handle_wrong_method_stub"},
148+
{"SharedRuntime::exception_handler_for_return_address", "_aot_exception_handler_for_return_address"},
149+
{"SharedRuntime::register_finalizer", "_aot_register_finalizer"},
150+
{"SharedRuntime::OSR_migration_end", "_aot_OSR_migration_end"},
151+
{"CompilerRuntime::resolve_dynamic_invoke", "_aot_resolve_dynamic_invoke"},
152+
{"CompilerRuntime::resolve_string_by_symbol", "_aot_resolve_string_by_symbol"},
153+
{"CompilerRuntime::resolve_klass_by_symbol", "_aot_resolve_klass_by_symbol"},
154+
{"CompilerRuntime::resolve_method_by_symbol_and_load_counters", "_aot_resolve_method_by_symbol_and_load_counters"},
155+
{"CompilerRuntime::initialize_klass_by_symbol", "_aot_initialize_klass_by_symbol"},
156+
{"CompilerRuntime::invocation_event", "_aot_invocation_event"},
157+
{"CompilerRuntime::backedge_event", "_aot_backedge_event"},
158158

159159
{"CompilerToVM::Data::dpow", "_aot_shared_runtime_dpow"},
160160
{"CompilerToVM::Data::dexp", "_aot_shared_runtime_dexp"},
@@ -215,6 +215,7 @@ public final class BinaryContainer implements SymbolTable {
215215

216216
{"StubRoutines::_counterMode_AESCrypt", "_aot_stub_routines_counterMode_AESCrypt" },
217217
{"StubRoutines::_ghash_processBlocks", "_aot_stub_routines_ghash_processBlocks" },
218+
{"StubRoutines::_base64_encodeBlock", "_aot_stub_routines_base64_encodeBlock" },
218219
{"StubRoutines::_crc32c_table_addr", "_aot_stub_routines_crc32c_table_addr" },
219220
{"StubRoutines::_updateBytesCRC32C", "_aot_stub_routines_updateBytesCRC32C" },
220221
{"StubRoutines::_updateBytesAdler32", "_aot_stub_routines_updateBytesAdler32" },
@@ -256,8 +257,8 @@ public final class BinaryContainer implements SymbolTable {
256257

257258
{"JVMCIRuntime::vm_error", "_aot_jvmci_runtime_vm_error"},
258259
{"JVMCIRuntime::new_array", "_aot_jvmci_runtime_new_array"}
259-
//@formatter:on
260260
};
261+
//@formatter:on
261262

262263
static {
263264
for (String[] entry : map) {
@@ -320,6 +321,7 @@ public BinaryContainer(OptionValues graalOptions, GraalHotSpotVMConfig graalHotS
320321
}
321322

322323
private void recordConfiguration(GraalHotSpotVMConfig graalHotSpotVMConfig, GraphBuilderConfiguration graphBuilderConfig) {
324+
// @Checkstyle: stop
323325
// @formatter:off
324326
boolean[] booleanFlags = { graalHotSpotVMConfig.cAssertions, // Debug VM
325327
graalHotSpotVMConfig.useCompressedOops,
@@ -343,6 +345,7 @@ private void recordConfiguration(GraalHotSpotVMConfig graalHotSpotVMConfig, Grap
343345
graalHotSpotVMConfig.codeSegmentSize,
344346
};
345347
// @formatter:on
348+
// @Checkstyle: resume
346349

347350
byte[] booleanFlagsAsBytes = flagsToByteArray(booleanFlags);
348351
int size0 = configContainer.getByteStreamSize();
@@ -541,8 +544,9 @@ public void createBinary(String outputFileName) throws IOException {
541544
JPECoffRelocObject pecoffobj = new JPECoffRelocObject(this, outputFileName);
542545
pecoffobj.createPECoffRelocObject(relocationTable, symbolTable.values());
543546
break;
544-
} else
547+
} else {
545548
throw new InternalError("Unsupported platform: " + osName);
549+
}
546550
}
547551
}
548552

‎compiler/src/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ByteContainer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import jdk.tools.jaotc.binformat.Symbol.Binding;
2929
import jdk.tools.jaotc.binformat.Symbol.Kind;
30-
import jdk.tools.jaotc.binformat.Container;
3130

3231
import java.io.ByteArrayOutputStream;
3332
import java.nio.ByteBuffer;

‎compiler/src/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/NativeSymbol.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package jdk.tools.jaotc.binformat;
2727

2828
/**
29-
* This class represents ia native OS specific Symbol
29+
* This class represents a native OS specific Symbol.
3030
*/
3131
public abstract class NativeSymbol {
3232

‎compiler/src/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Relocation.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
public final class Relocation {
2929

30-
public enum RelocType
31-
{
30+
// @formatter:off (workaround for Eclipse formatting bug)
31+
public enum RelocType {
3232
UNDEFINED,
3333
JAVA_CALL_INDIRECT,
3434
JAVA_CALL_DIRECT,
@@ -38,6 +38,7 @@ public enum RelocType
3838
EXTERNAL_GOT_TO_PLT,
3939
EXTERNAL_PLT_TO_GOT
4040
}
41+
// @formatter:on
4142

4243
private final RelocType type;
4344

0 commit comments

Comments
 (0)