Fix class initialization optimization

This commit is contained in:
Alexey Andreev 2020-05-19 13:27:26 +03:00
parent eebe16157b
commit ecc4be2d25
6 changed files with 115 additions and 1 deletions

View File

@ -301,7 +301,7 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
methodInfo.classesWithModifiedFields = null;
} else if (calledMethod.classesWithModifiedFields != null) {
for (String className : calledMethod.classesWithModifiedFields) {
if (className.equals(currentClass)) {
if (!className.equals(currentClass)) {
if (methodInfo.classesWithModifiedFields == null) {
methodInfo.classesWithModifiedFields = new HashSet<>();
}

View File

@ -0,0 +1,20 @@
/*
* Copyright 2020 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.util;
public interface LoadOrderService {
void run();
}

View File

@ -0,0 +1,45 @@
/*
* Copyright 2020 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.util;
public class LoadOrderServiceImpl implements LoadOrderService {
static {
Log.create();
}
public LoadOrderServiceImpl() {
Log.run();
}
@Override
public void run() {
LoadOrderServiceLog.content.append("service run;");
}
static class Log {
static {
LoadOrderServiceLog.content.append("class init;");
}
static void create() {
LoadOrderServiceLog.content.append("log create;");
}
static void run() {
LoadOrderServiceLog.content.append("log run;");
}
}
}

View File

@ -0,0 +1,23 @@
/*
* Copyright 2020 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.util;
class LoadOrderServiceLog {
private LoadOrderServiceLog() {
}
static final StringBuilder content = new StringBuilder();
}

View File

@ -43,4 +43,13 @@ public class ServiceLoaderTest {
strings.sort(String::compareTo);
assertEquals(Arrays.asList("A", "B"), strings);
}
@Test
public void classLoading() {
LoadOrderServiceLog.content.append("before;");
for (LoadOrderService service : ServiceLoader.load(LoadOrderService.class)) {
service.run();
}
assertEquals("before;class init;log create;log run;service run;", LoadOrderServiceLog.content.toString());
}
}

View File

@ -0,0 +1,17 @@
#
# Copyright 2017 Alexey Andreev.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
org.teavm.classlib.java.util.LoadOrderServiceImpl