Move writeCStandardHeaders() to CSourceCodeWriter

XUZHOUWANG · Aug 26, 2020 · cc5dc55 · cc5dc55
1 parent 4425973
commit cc5dc55
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/...tevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CSourceCodeWriter.java b/...tevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CSourceCodeWriter.java
@@ -26,6 +26,7 @@
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 import static com.oracle.svm.hosted.NativeImageOptions.CStandards.C11;
+import static com.oracle.svm.hosted.NativeImageOptions.CStandards.C99;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -36,6 +37,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -80,6 +82,21 @@ public CSourceCodeWriter(Path tempDirectory) {
         this.currentLine = new StringBuilder(100);
     }
 
+    public void writeCStandardHeaders() {
+        if (NativeImageOptions.getCStandard().compatibleWith(C99)) {
+            if (!Platform.includedIn(Platform.WINDOWS.class)) {
+                /*
+                 * No stdbool.h in Windows SDK 7.1. If we add native-compiler version detection this
+                 * should only be omitted if cl.exe version is < 19.*.
+                 */
+                includeFiles(Collections.singletonList("<stdbool.h>"));
+            }
+        }
+        if (NativeImageOptions.getCStandard().compatibleWith(C11)) {
+            includeFiles(Collections.singletonList("<stdint.h>"));
+        }
+    }
+
     public int currentLineNumber() {
         return lines.size() + 1;
     }

diff --git a/...ratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/QueryCodeWriter.java b/...ratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/QueryCodeWriter.java
@@ -25,20 +25,16 @@
 package com.oracle.svm.hosted.c.codegen;
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
-import static com.oracle.svm.hosted.NativeImageOptions.CStandards.C11;
-import static com.oracle.svm.hosted.NativeImageOptions.CStandards.C99;
 import static com.oracle.svm.hosted.c.query.QueryResultFormat.DELIMINATOR;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.svm.core.c.NativeImageHeaderPreamble;
-import com.oracle.svm.hosted.NativeImageOptions;
 import com.oracle.svm.hosted.c.info.ConstantInfo;
 import com.oracle.svm.hosted.c.info.ElementInfo;
 import com.oracle.svm.hosted.c.info.EnumConstantInfo;
@@ -107,7 +103,7 @@ protected void visitNativeCodeInfo(NativeCodeInfo nativeCodeInfo) {
 
         writer.includeFiles(Arrays.asList("<stdio.h>", "<stddef.h>", "<memory.h>"));
 
-        writeCStandardHeaders(writer);
+        writer.writeCStandardHeaders();
 
         /* Write general macro definitions. */
         writer.appendln();
@@ -130,21 +126,6 @@ protected void visitNativeCodeInfo(NativeCodeInfo nativeCodeInfo) {
         writer.appendln("}");
     }
 
-    public static void writeCStandardHeaders(CSourceCodeWriter writer) {
-        if (NativeImageOptions.getCStandard().compatibleWith(C99)) {
-            if (!Platform.includedIn(Platform.WINDOWS.class)) {
-                /*
-                 * No stdbool.h in Windows SDK 7.1. If we add native-compiler version detection this
-                 * should only be omitted if cl.exe version is < 19.*.
-                 */
-                writer.includeFiles(Collections.singletonList("<stdbool.h>"));
-            }
-        }
-        if (NativeImageOptions.getCStandard().compatibleWith(C11)) {
-            writer.includeFiles(Collections.singletonList("<stdint.h>"));
-        }
-    }
-
     @Override
     protected void visitConstantInfo(ConstantInfo constantInfo) {
         switch (constantInfo.getKind()) {

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeBootImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeBootImage.java
@@ -98,7 +98,6 @@
 import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.c.codegen.CSourceCodeWriter;
-import com.oracle.svm.hosted.c.codegen.QueryCodeWriter;
 import com.oracle.svm.hosted.code.CEntryPointCallStubMethod;
 import com.oracle.svm.hosted.code.CEntryPointCallStubSupport;
 import com.oracle.svm.hosted.code.CEntryPointData;
@@ -207,7 +206,7 @@ private void writeHeaderFile(Path outDir, Header header, List<HostedMethod> meth
 
         writer.appendln();
 
-        QueryCodeWriter.writeCStandardHeaders(writer);
+        writer.writeCStandardHeaders();
 
         List<String> dependencies = header.dependsOn().stream()
                         .map(NativeBootImage::instantiateCHeader)