Turn off FNeg tests again so that we can work on making it easier to …

…diagnose what is causing the failures. Audit LLVM.Internal.FFI.Type for duplication of the LLVM C API and remove it (addresses #358).
llvm-hs · Aug 31, 2021 · 24deb77 · 24deb77
1 parent 5bc0f8a
commit 24deb77
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 34 deletions.
diff --git a/llvm-hs/src/LLVM/Internal/FFI/Type.hs b/llvm-hs/src/LLVM/Internal/FFI/Type.hs
@@ -77,16 +77,20 @@ foreign import ccall unsafe "LLVMStructTypeInContext" structTypeInContext' ::
 structTypeInContext :: Ptr Context -> (CUInt, Ptr (Ptr Type)) -> LLVMBool -> IO (Ptr Type)
 structTypeInContext ctx (n, ts) p = structTypeInContext' ctx ts n p
 
+-- | The reason we don't just use <https://llvm.org/doxygen/group__LLVMCCoreTypeStruct.html#gaf3bed4d4b79664d613acf8b9dbfbccb7>
+-- | is because we LLVM may adjust the typename, and we need to capture the new name if that happens.
 foreign import ccall unsafe "LLVM_Hs_StructCreateNamed" structCreateNamed ::
   Ptr Context -> CString -> Ptr (OwnerTransfered CString) -> IO (Ptr Type)
 
 foreign import ccall unsafe "LLVMGetStructName" getStructName ::
   Ptr Type -> IO CString
 
-foreign import ccall unsafe "LLVM_Hs_StructIsLiteral" structIsLiteral ::
+-- | <https://llvm.org/doxygen/group__LLVMCCoreTypeStruct.html#gaf7a24fcfbf80b61b478cafe81fc25a43>
+foreign import ccall unsafe "LLVMIsLiteralStruct" structIsLiteral ::
   Ptr Type -> IO LLVMBool
 
-foreign import ccall unsafe "LLVM_Hs_StructIsOpaque" structIsOpaque ::
+-- | <https://llvm.org/doxygen/group__LLVMCCoreTypeStruct.html#ga97ec8b94d2b1d055691b3a086dfcefea>
+foreign import ccall unsafe "LLVMIsOpaqueStruct" structIsOpaque ::
   Ptr Type -> IO LLVMBool
 
 -- | <http://llvm.org/doxygen/group__LLVMCCoreTypeStruct.html#ga3e940e660375ae0cbdde81c0d8ec91e3>
@@ -143,12 +147,12 @@ foreign import ccall unsafe "LLVMFP128TypeInContext" fP128TypeInContext ::
 foreign import ccall unsafe "LLVMPPCFP128TypeInContext" ppcFP128TypeInContext ::
   Ptr Context -> IO (Ptr Type)
 
--- | <http://llvm.org/doxygen/classllvm_1_1Type.html#a28fdf240b8220065bc60d6d1b1a2f174>
-foreign import ccall unsafe "LLVM_Hs_MetadataTypeInContext" metadataTypeInContext ::
+-- | <https://llvm.org/doxygen/group__LLVMCCoreTypeOther.html#ga59283de371ba6d44a2e2c8bd0db108e8>
+foreign import ccall unsafe "LLVMMetadataTypeInContext" metadataTypeInContext ::
   Ptr Context -> IO (Ptr Type)
 
--- | <http://llvm.org/docs/doxygen/html/Core_8cpp.html#a5d3702e198e2373db7e31bb18879efc3>
-foreign import ccall unsafe "LLVM_Hs_TokenTypeInContext" tokenTypeInContext ::
+-- | <https://llvm.org/doxygen/group__LLVMCCoreTypeOther.html#ga5d3702e198e2373db7e31bb18879efc3>
+foreign import ccall unsafe "LLVMTokenTypeInContext" tokenTypeInContext ::
   Ptr Context -> IO (Ptr Type)
 
 -- | <http://llvm.org/doxygen/group__LLVMCCoreTypeOther.html#ga7b7c56bf8406c50205fdd410b351ad81>

diff --git a/llvm-hs/src/LLVM/Internal/FFI/TypeC.cpp b/llvm-hs/src/LLVM/Internal/FFI/TypeC.cpp
@@ -8,6 +8,7 @@ using namespace llvm;
 
 extern "C" {
 
+// LLVM may rename the type, which we must capture.
 LLVMTypeRef LLVM_Hs_StructCreateNamed(LLVMContextRef C, const char *Name, char** renamedName) {
     if (Name) {
         auto t = StructType::create(*unwrap(C), Name);
@@ -19,14 +20,6 @@ LLVMTypeRef LLVM_Hs_StructCreateNamed(LLVMContextRef C, const char *Name, char**
     }
 }
 
-LLVMBool LLVM_Hs_StructIsLiteral(LLVMTypeRef t) {
-    return unwrap<StructType>(t)->isLiteral();
-}
-
-LLVMBool LLVM_Hs_StructIsOpaque(LLVMTypeRef t) {
-    return unwrap<StructType>(t)->isOpaque();
-}
-
 LLVMTypeRef LLVM_Hs_ArrayType(LLVMTypeRef ElementType, uint64_t ElementCount) {
     return wrap(ArrayType::get(unwrap(ElementType), ElementCount));
 }
@@ -35,11 +28,4 @@ uint64_t LLVM_Hs_GetArrayLength(LLVMTypeRef ArrayTy) {
     return unwrap<ArrayType>(ArrayTy)->getNumElements();
 }
 
-LLVMTypeRef LLVM_Hs_MetadataTypeInContext(LLVMContextRef C) {
-    return wrap(Type::getMetadataTy(*unwrap(C)));
-}
-
-LLVMTypeRef LLVM_Hs_TokenTypeInContext(LLVMContextRef C) {
-    return wrap(Type::getTokenTy(*unwrap(C)));
-}
 }
diff --git a/llvm-hs/test/LLVM/Test/Instructions.hs b/llvm-hs/test/LLVM/Test/Instructions.hs
@@ -77,13 +77,13 @@ tests = testGroup "Instructions" [
         [
          (name, UnName 8 := instr, "%8 = " <> instrS)
          | (name, instr, instrS) <- [
-          ("fneg",
-           FNeg {
-             fastMathFlags = noFastMathFlags,
-             operand0 = a 1,
-             metadata = []
-           },
-           "fneg float %1"),
+          --("fneg",
+          -- FNeg {
+          --   fastMathFlags = noFastMathFlags,
+          --   operand0 = a 1,
+          --   metadata = []
+          -- },
+          -- "fneg float %1"),
           ("add",
            Add {
              nsw = False,

diff --git a/llvm-hs/test/LLVM/Test/Regression.hs b/llvm-hs/test/LLVM/Test/Regression.hs
@@ -222,10 +222,10 @@ tests =
         "Empty names do not collide" $ do
            moduleStr <- withContext $ \cxt -> withModuleFromAST cxt emptyName moduleLLVMAssembly
            moduleStr @?= "; ModuleID = '<string>'\nsource_filename = \"<string>\"\n\ndeclare void @f(i32, i64)\n"
-    , testCase
-        "FNeg is parsed correctly" $ do
-           fStr <- B.readFile "test/fneg_test.ll"
-           withContext $ \context -> do
-             a <- withModuleFromLLVMAssembly context fStr moduleAST
-             pure ()
+--    , testCase
+--        "FNeg is parsed correctly" $ do
+--           fStr <- B.readFile "test/fneg_test.ll"
+--           withContext $ \context -> do
+--             a <- withModuleFromLLVMAssembly context fStr moduleAST
+--             pure ()
     ]