[Claml] support llvm-15 & ocaml-5

Author: KihongHeo

.gitignore

@@ -11,6 +11,7 @@ src/declKind.ml
 src/attrKind.ml
 src/implicitCastKind.ml
 config
+test/dune
 
 .vscode
 rewriter-test-runner

bootstrap.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-SUPPORTED_LLVM_VERSION=("13" "12")
+SUPPORTED_LLVM_VERSION=("15" "13" "12")
 
 find_llvm_config() {
   LLVM_FOUND=0
-  for v in ${SUPPORTED_LLVM_VERSION[@]}; do
-    which llvm-config-$v >&/dev/null
+  for LLVM_VERSION in ${SUPPORTED_LLVM_VERSION[@]}; do
+    which llvm-config-$LLVM_VERSION >&/dev/null
     if [[ $? == 0 ]]; then
-      LLVM_CONFIG=llvm-config-$v
+      LLVM_CONFIG=llvm-config-$LLVM_VERSION
       echo "$LLVM_CONFIG found"
       return 0
     fi
@@ -33,7 +33,7 @@ TYPE_NODES_FILE=$LLVM_HOME/include/clang/AST/TypeNodes.inc
 
 HEADER="(* This file is automatically generated by bootstrap.sh *)"
 
-LLVM_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangARCMigrate -lclangRewrite -lclangEdit -lclangAST -lclangLex -lclangBasic"
+LLVM_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangSupport -lclangAnalysis -lclangARCMigrate -lclangRewrite -lclangEdit -lclangAST -lclangLex -lclangBasic"
 
 gen_config() {
   mkdir -p config
@@ -148,13 +148,14 @@ gen_implicit_cast_kind() {
 
 gen_test() {
   TARGET=test/dune
+  # https://ocaml.org/manual/4.14/instrumented-runtime.html#s:instr-runtime-enabling
   echo "(executable
  (name test)
  (modules test)
  (flags -runtime-variant d -g)
  (libraries claml))
 " >$TARGET
-  for cfile in $(find test -maxdepth 1 -name "*.c"); do
+  for cfile in $(find test -maxdepth 1 -name "*.c" | sort); do
     cfile=$(basename $cfile)
     echo "(rule
  (deps $cfile)
@@ -165,15 +166,15 @@ gen_test() {
    (pipe-stdout
     (ignore-stderr
      (run ./test.exe %{deps}))
-    (run clang-format)))))
+    (run clang-format-$LLVM_VERSION)))))
 
 (rule
  (alias runtest)
  (action
   (diff ${cfile%%.*}.expected ${cfile%%.*}.output)))
 " >>$TARGET
   done
-  
+
   sed -i '$d' $TARGET
 }
 

build.sh

@@ -5,8 +5,8 @@ set -e
 export OPAMYES=1
 
 NCPU="$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)"
-OCAML_VERSION="4.13.1"
-CLAML_OPAM_SWITCH=claml-"$OCAML_VERSION"
+OCAML_VERSION="5.1.0"
+CLAML_OPAM_SWITCH=claml-"$OCAML_VERSION+flambda"
 opam init --compiler=$OCAML_VERSION -j $NCPU --no-setup
 
 switch_exists=no

src/typeKind.ml

@@ -8,20 +8,21 @@ type t =
   | VariableArrayType
   | AtomicType
   | AttributedType
+  | BTFTagAttributedType
+  | BitIntType
   | BlockPointerType
   | BuiltinType
   | ComplexType
   | DecltypeType
   | AutoType
   | DeducedTemplateSpecializationType
   | DependentAddressSpaceType
-  | DependentExtIntType
+  | DependentBitIntType
   | DependentNameType
   | DependentSizedExtVectorType
   | DependentTemplateSpecializationType
   | DependentVectorType
   | ElaboratedType
-  | ExtIntType
   | FunctionNoProtoType
   | FunctionProtoType
   | InjectedClassNameType
@@ -50,6 +51,7 @@ type t =
   | TypedefType
   | UnaryTransformType
   | UnresolvedUsingType
+  | UsingType
   | VectorType
   | ExtVectorType
 [@@deriving show]

test/attr-stmt0.expected

@@ -11,7 +11,8 @@ int main() {
   int c = -1;
   switch (a) {
   case 0:
-    __attribute__((fallthrough, );) case 1 : c = 0;
+  __attribute__((fallthrough, );) case 1:
+    c = 0;
     break;
   default:
     c = 1;