From baf889c87913b08f444291242e0c170b1aad14f4 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 14 Feb 2016 16:14:30 -0700 Subject: parseh: fix __cdecl causing a fn ptr to be double ptr --- src/analyze.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/analyze.cpp') diff --git a/src/analyze.cpp b/src/analyze.cpp index adab231124..d2381a9156 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -3886,17 +3886,19 @@ static TypeTableEntry *analyze_cast_expr(CodeGen *g, ImportTableEntry *import, B } // explicit cast from pointer to another pointer - if (actual_type->id == TypeTableEntryIdPointer && - wanted_type->id == TypeTableEntryIdPointer) + if ((actual_type->id == TypeTableEntryIdPointer || actual_type->id == TypeTableEntryIdFn) && + (wanted_type->id == TypeTableEntryIdPointer || wanted_type->id == TypeTableEntryIdFn)) { return resolve_cast(g, context, node, expr_node, wanted_type, CastOpPointerReinterpret, false); } // explicit cast from maybe pointer to another maybe pointer if (actual_type->id == TypeTableEntryIdMaybe && - actual_type->data.maybe.child_type->id == TypeTableEntryIdPointer && + (actual_type->data.maybe.child_type->id == TypeTableEntryIdPointer || + actual_type->data.maybe.child_type->id == TypeTableEntryIdFn) && wanted_type->id == TypeTableEntryIdMaybe && - wanted_type->data.maybe.child_type->id == TypeTableEntryIdPointer) + (wanted_type->data.maybe.child_type->id == TypeTableEntryIdPointer || + wanted_type->data.maybe.child_type->id == TypeTableEntryIdFn)) { return resolve_cast(g, context, node, expr_node, wanted_type, CastOpPointerReinterpret, false); } -- cgit v1.2.3