Generate complete clean-target headers (#4494)

Author: shai-almog

vm/ByteCodeTranslator/src/cn1_globals.h

@@ -1029,6 +1029,7 @@ extern void initMethodStack(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT __cn1ThisObje
 
 
 #if defined(__APPLE__) && defined(__OBJC__)
+@class NSString;
 extern JAVA_OBJECT fromNSString(CODENAME_ONE_THREAD_STATE, NSString* str);
 extern NSString* toNSString(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT o);
 #else

vm/ByteCodeTranslator/src/com/codename1/tools/translator/BytecodeMethod.java

@@ -1103,10 +1103,6 @@ public void appendVirtualMethodC(String cls, StringBuilder b, String offset, boo
             returnType.appendCMethodExt(bld);
         }
 
-        if(!forceVirtual && !virtualMethodsInvoked.contains(bld.toString())) {
-            return;
-        }
-                
         // generate the function pointer declaration
         appendCMethodPrefix("\ntypedef ", ")", b, "(*functionPtr_", cls);
         b.append(";\n");
@@ -1156,9 +1152,6 @@ public void appendVirtualMethodHeader(StringBuilder b, String cls) {
             bld.append("_R");
             returnType.appendCMethodExt(bld);
         }
-        if(!forceVirtual && !virtualMethodsInvoked.contains(bld.toString())) {
-            return;
-        }
         appendCMethodPrefix(b, "virtual_", cls);
         b.append(";\n");
     }

vm/tests/src/test/java/com/codename1/tools/translator/BytecodeInstructionIntegrationTest.java

@@ -111,7 +111,6 @@ void translatesOptimizedBytecodeToLLVMExecutable(CompilerHelper.CompilerConfig c
         assertTrue(Files.exists(cmakeLists), "Translator should emit a CMake project for the optimized sample");
 
         Path srcRoot = distDir.resolve("CustomBytecodeApp-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
 
         Path generatedSource = findGeneratedSource(srcRoot);
         String generatedCode = new String(Files.readAllBytes(generatedSource), StandardCharsets.UTF_8);
@@ -262,7 +261,6 @@ void translatesInvokeAndLdcBytecodeToLLVMExecutable(CompilerHelper.CompilerConfi
         assertTrue(Files.exists(cmakeLists), "Translator should emit a CMake project for Invoke/Ldc sample");
 
         Path srcRoot = distDir.resolve("InvokeLdcLocalVars-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
 
         Path generatedSource = findGeneratedSource(srcRoot, "InvokeLdcLocalVarsApp");
         String generatedCode = new String(Files.readAllBytes(generatedSource), StandardCharsets.UTF_8);

vm/tests/src/test/java/com/codename1/tools/translator/CleanTargetIntegrationTest.java

@@ -79,7 +79,6 @@ void generatesRunnableHelloWorldUsingCleanTarget(CompilerHelper.CompilerConfig c
         assertTrue(Files.exists(cmakeLists), "Translator should emit a CMake project");
 
         Path srcRoot = distDir.resolve("HelloCleanApp-src");
-        patchCn1Globals(srcRoot);
 
         replaceLibraryWithExecutableTarget(cmakeLists, srcRoot.getFileName().toString());
 
@@ -181,20 +180,6 @@ static String runCommand(List<String> command, Path workingDir) throws Exception
         return output;
     }
 
-    static void patchCn1Globals(Path srcRoot) throws IOException {
-        Path cn1Globals = srcRoot.resolve("cn1_globals.h");
-        String content = new String(Files.readAllBytes(cn1Globals), StandardCharsets.UTF_8);
-        if (!content.contains("@class NSString;")) {
-            content = content.replace("#ifdef __OBJC__\n", "#ifdef __OBJC__\n@class NSString;\n");
-            Files.write(cn1Globals, content.getBytes(StandardCharsets.UTF_8));
-        }
-        if (!content.contains("#include <string.h>")) {
-            content = content.replace("#include <stdlib.h>\n", "#include <stdlib.h>\n#include <string.h>\n#include <math.h>\n#include <limits.h>\n");
-            Files.write(cn1Globals, content.getBytes(StandardCharsets.UTF_8));
-        }
-    }
-
-
     static String helloWorldSource() {
         return "public class HelloWorld {\n" +
                 "    private static native void nativeHello();\n" +

vm/tests/src/test/java/com/codename1/tools/translator/CompilerHelper.java

@@ -230,8 +230,6 @@ public static boolean compileAndRun(String code, String expectedOutput) throws E
             CleanTargetIntegrationTest.runTranslator(classesDir, outputDir, "ExecutorApp");
 
             java.nio.file.Path distDir = outputDir.resolve("dist");
-            java.nio.file.Path srcRoot = distDir.resolve("ExecutorApp-src");
-            CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
 
             CleanTargetIntegrationTest.replaceLibraryWithExecutableTarget(outputDir.resolve("dist").resolve("CMakeLists.txt"), "ExecutorApp-src");
 

vm/tests/src/test/java/com/codename1/tools/translator/FileClassIntegrationTest.java

@@ -70,8 +70,6 @@ public void testFileClassMethods(CompilerHelper.CompilerConfig config) throws Ex
         assertTrue(Files.exists(cmakeLists), "Translator should emit a CMake project");
 
         Path srcRoot = distDir.resolve("FileTestApp-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
-
         replaceLibraryWithExecutableTarget(cmakeLists, srcRoot.getFileName().toString());
 
         Path buildDir = distDir.resolve("build");

vm/tests/src/test/java/com/codename1/tools/translator/LambdaIntegrationTest.java

@@ -118,7 +118,6 @@ void translatesLambdaBytecodeToLLVMExecutable(String targetVersion) throws Excep
         assertTrue(Files.exists(cmakeLists), "Translator should emit a CMake project");
 
         Path srcRoot = distDir.resolve("LambdaApp-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
 
         CleanTargetIntegrationTest.replaceLibraryWithExecutableTarget(cmakeLists, srcRoot.getFileName().toString());
 

vm/tests/src/test/java/com/codename1/tools/translator/LockIntegrationTest.java

@@ -75,9 +75,6 @@ void verifiesLockAndReentrantLockBehavior(CompilerHelper.CompilerConfig config)
         Path cmakeLists = distDir.resolve("CMakeLists.txt");
         assertTrue(Files.exists(cmakeLists));
 
-        Path srcRoot = distDir.resolve("LockTestApp-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
-
         Path buildDir = distDir.resolve("build");
         Files.createDirectories(buildDir);
 

vm/tests/src/test/java/com/codename1/tools/translator/ReadWriteLockIntegrationTest.java

@@ -75,10 +75,6 @@ void verifiesReadWriteLockBehavior(CompilerHelper.CompilerConfig config) throws
         Path cmakeLists = distDir.resolve("CMakeLists.txt");
         assertTrue(Files.exists(cmakeLists));
 
-        Path srcRoot = distDir.resolve("ReadWriteLockTestApp-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
-        ensureReentrantReadWriteLockHeader(srcRoot);
-
         Path buildDir = distDir.resolve("build");
         Files.createDirectories(buildDir);
 
@@ -191,18 +187,4 @@ private String nativeReportSource() {
     }
 
 
-    private void ensureReentrantReadWriteLockHeader(Path srcRoot) throws java.io.IOException {
-        Path header = srcRoot.resolve("java_util_concurrent_locks_ReentrantReadWriteLock.h");
-        if (!Files.exists(header)) {
-            return;
-        }
-        String content = new String(Files.readAllBytes(header), StandardCharsets.UTF_8);
-        if (content.contains("virtual_java_util_concurrent_locks_ReentrantReadWriteLock_readLock")) {
-            return;
-        }
-        String additions = "JAVA_OBJECT virtual_java_util_concurrent_locks_ReentrantReadWriteLock_readLock___R_java_util_concurrent_locks_ReentrantReadWriteLock_ReadLock(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT __cn1ThisObject);\n" +
-                "JAVA_OBJECT virtual_java_util_concurrent_locks_ReentrantReadWriteLock_writeLock___R_java_util_concurrent_locks_ReentrantReadWriteLock_WriteLock(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT __cn1ThisObject);\n";
-        content = content.replace("#endif\n", additions + "#endif\n");
-        Files.write(header, content.getBytes(StandardCharsets.UTF_8));
-    }
 }

vm/tests/src/test/java/com/codename1/tools/translator/StampedLockIntegrationTest.java

@@ -75,9 +75,6 @@ void verifiesStampedLockBehavior(CompilerHelper.CompilerConfig config) throws Ex
         Path cmakeLists = distDir.resolve("CMakeLists.txt");
         assertTrue(Files.exists(cmakeLists));
 
-        Path srcRoot = distDir.resolve("StampedLockTestApp-src");
-        CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
-
         Path buildDir = distDir.resolve("build");
         Files.createDirectories(buildDir);