Skip to content

[OCaml] Make OCaml MetadataKind type consistent with C API #134507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2025

Conversation

alan-j-hu
Copy link
Contributor

Fixes breakage of OCaml API introduced by commit 6894734.

Fixes breakage of OCaml tests introduced by commit 6894734.
@alan-j-hu alan-j-hu requested a review from nikic April 5, 2025 20:46
@llvmbot
Copy link
Member

llvmbot commented Apr 5, 2025

@llvm/pr-subscribers-debuginfo

Author: Alan (alan-j-hu)

Changes

Fixes breakage of OCaml API introduced by commit 6894734.


Full diff: https://github.com/llvm/llvm-project/pull/134507.diff

4 Files Affected:

  • (modified) llvm/bindings/ocaml/debuginfo/llvm_debuginfo.ml (+1)
  • (modified) llvm/bindings/ocaml/debuginfo/llvm_debuginfo.mli (+1)
  • (modified) llvm/include/llvm-c/DebugInfo.h (+1-1)
  • (modified) llvm/test/CMakeLists.txt (+1)
diff --git a/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.ml b/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.ml
index b5c8128c4c090..3e9a82962d99a 100644
--- a/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.ml
+++ b/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.ml
@@ -144,6 +144,7 @@ module MetadataKind = struct
     | DIArgListMetadataKind
     | DIAssignIDMetadataKind
     | DISubrangeTypeMetadataKind
+    | DIFixedPointTypeMetadataKind
 end
 
 (** The amount of debug information to emit. *)
diff --git a/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.mli b/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.mli
index 8a36a2b7d81b1..d759b53642755 100644
--- a/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.mli
+++ b/llvm/bindings/ocaml/debuginfo/llvm_debuginfo.mli
@@ -148,6 +148,7 @@ module MetadataKind : sig
     | DIArgListMetadataKind
     | DIAssignIDMetadataKind
     | DISubrangeTypeMetadataKind
+    | DIFixedPointTypeMetadataKind
 end
 
 (** The amount of debug information to emit. *)
diff --git a/llvm/include/llvm-c/DebugInfo.h b/llvm/include/llvm-c/DebugInfo.h
index 9fbe31d2629bd..11e0b9b4c81e8 100644
--- a/llvm/include/llvm-c/DebugInfo.h
+++ b/llvm/include/llvm-c/DebugInfo.h
@@ -173,7 +173,6 @@ enum {
   LLVMDISubrangeMetadataKind,
   LLVMDIEnumeratorMetadataKind,
   LLVMDIBasicTypeMetadataKind,
-  LLVMDIFixedPointTypeMetadataKind,
   LLVMDIDerivedTypeMetadataKind,
   LLVMDICompositeTypeMetadataKind,
   LLVMDISubroutineTypeMetadataKind,
@@ -199,6 +198,7 @@ enum {
   LLVMDIArgListMetadataKind,
   LLVMDIAssignIDMetadataKind,
   LLVMDISubrangeTypeMetadataKind,
+  LLVMDIFixedPointTypeMetadataKind,
 };
 typedef unsigned LLVMMetadataKind;
 
diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index d984193875fa2..a67e2b85d9b53 100644
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -212,6 +212,7 @@ if(TARGET ocaml_llvm)
           ocaml_llvm_analysis
           ocaml_llvm_bitreader
           ocaml_llvm_bitwriter
+          ocaml_llvm_debuginfo
           ocaml_llvm_executionengine
           ocaml_llvm_irreader
           ocaml_llvm_linker

@alan-j-hu
Copy link
Contributor Author

See also the conversation at #132268. As advised, I added a comment telling people to only append to the enum. However, looks like it wasn't noticed.

@alan-j-hu alan-j-hu merged commit 7833107 into llvm:main Apr 5, 2025
11 of 13 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Apr 6, 2025

LLVM Buildbot has detected a new failure on builder clang-aarch64-sve2-vla-2stage running on linaro-g4-02 while building llvm at step 12 "ninja check 2".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/199/builds/2609

Here is the relevant piece of the build log for the reference
Step 12 (ninja check 2) failure: stage 2 checked (failure)
...
PASS: Flang :: Driver/override-triple.ll (24781 of 96621)
PASS: Flang :: Driver/predefined-macros-compiler-version.F90 (24782 of 96621)
PASS: Flang :: Driver/print-resource-dir.F90 (24783 of 96621)
PASS: Flang :: Driver/parse-error.ll (24784 of 96621)
PASS: Flang :: Driver/macro-def-undef.F90 (24785 of 96621)
PASS: Flang :: Driver/include-header.f90 (24786 of 96621)
PASS: Flang :: Driver/print-pipeline-passes.f90 (24787 of 96621)
PASS: Flang :: Driver/parse-fir-error.ll (24788 of 96621)
PASS: Flang :: Driver/phases.f90 (24789 of 96621)
UNRESOLVED: Flang :: Driver/slp-vectorize.ll (24790 of 96621)
******************** TEST 'Flang :: Driver/slp-vectorize.ll' FAILED ********************
Test has no 'RUN:' line
********************
PASS: Flang :: Driver/mlir-pass-pipeline.f90 (24791 of 96621)
PASS: Flang :: Driver/linker-flags.f90 (24792 of 96621)
PASS: Flang :: Driver/mlink-builtin-bc.f90 (24793 of 96621)
PASS: Flang :: Driver/missing-arg.f90 (24794 of 96621)
PASS: Flang :: Driver/parse-ir-error.f95 (24795 of 96621)
PASS: Flang :: Driver/print-target-triple.f90 (24796 of 96621)
PASS: Flang :: Driver/fixed-line-length.f90 (24797 of 96621)
PASS: Flang :: Driver/fsave-optimization-record.f90 (24798 of 96621)
PASS: Flang :: Driver/pthread.f90 (24799 of 96621)
PASS: Flang :: Driver/std2018-wrong.f90 (24800 of 96621)
PASS: Flang :: Driver/scanning-error.f95 (24801 of 96621)
PASS: Flang :: Driver/lto-bc.f90 (24802 of 96621)
PASS: Flang :: Driver/pp-fixed-form.f90 (24803 of 96621)
PASS: Flang :: Driver/supported-suffices/f08-suffix.f08 (24804 of 96621)
PASS: Flang :: Driver/pass-plugin-not-found.f90 (24805 of 96621)
PASS: Flang :: Driver/tco-code-gen-llvm.fir (24806 of 96621)
PASS: Clangd Unit Tests :: ./ClangdTests/73/81 (24807 of 96621)
PASS: Flang :: Driver/supported-suffices/f03-suffix.f03 (24808 of 96621)
PASS: Flang :: Driver/target.f90 (24809 of 96621)
PASS: Flang :: Driver/mllvm.f90 (24810 of 96621)
PASS: Flang :: Driver/q-unused-arguments.f90 (24811 of 96621)
PASS: Flang :: Driver/target-gpu-features.f90 (24812 of 96621)
PASS: Flang :: Driver/multiple-input-files.f90 (24813 of 96621)
PASS: Flang :: Driver/lto-flags.f90 (24814 of 96621)
PASS: Flang :: Driver/unparse-with-modules.f90 (24815 of 96621)
PASS: Flang :: Driver/unsupported-vscale-max-min.f90 (24816 of 96621)
PASS: Flang :: Driver/no-duplicate-main.f90 (24817 of 96621)
PASS: Flang :: Driver/optimization-remark-invalid.f90 (24818 of 96621)
PASS: Flang :: Driver/target-machine-error.f90 (24819 of 96621)
PASS: Flang :: Driver/save-temps.f90 (24820 of 96621)
PASS: Flang :: Driver/unparse-use-analyzed.f95 (24821 of 96621)
PASS: Flang :: Driver/prescanner-diag.f90 (24822 of 96621)
PASS: Flang :: Driver/std2018.f90 (24823 of 96621)
PASS: Flang :: Driver/input-from-stdin/input-from-stdin.f90 (24824 of 96621)
PASS: Flang :: Driver/save-temps-use-module.f90 (24825 of 96621)
PASS: Flang :: Driver/optimization-remark-backend.f90 (24826 of 96621)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants