diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2016-02-14 16:14:30 -0700 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2016-02-14 16:14:30 -0700 |
| commit | baf889c87913b08f444291242e0c170b1aad14f4 (patch) | |
| tree | a71b79db04b201cd0ab459e9a52cf32cc6c7cd98 /src/analyze.cpp | |
| parent | 87922bfae0cbb90bd8e05a00c51a0c737ef3245f (diff) | |
| download | zig-baf889c87913b08f444291242e0c170b1aad14f4.tar.gz zig-baf889c87913b08f444291242e0c170b1aad14f4.zip | |
parseh: fix __cdecl causing a fn ptr to be double ptr
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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); } |