Merge pull request #589 from GaloisInc/issue583

Avoid generating 1-tuple Cryptol types from 1-field LLVM struct types.
GaloisInc · Nov 16, 2019 · 47aa9f3 · 47aa9f3
2 parents 90cd4da + bcb6da9
commit 47aa9f3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/SAWScript/Crucible/LLVM/Builtins.hs b/src/SAWScript/Crucible/LLVM/Builtins.hs
@@ -1314,7 +1314,9 @@ cryptolTypeOfActual dl mt =
     Crucible.StructType si ->
       do let memtypes = V.toList (Crucible.siFieldTypes si)
          ctys <- traverse (cryptolTypeOfActual dl) memtypes
-         return $ Cryptol.tTuple ctys
+         case ctys of
+           [cty] -> return cty
+           _ -> return $ Cryptol.tTuple ctys
     _ ->
       Nothing