Commit 6664679c8c1d24e929630daf8392ca09620d4a94 | zig

author	Veikka Tuominen <git@vexu.eu> 2021-06-13 10:56:54+03:00
committer	Veikka Tuominen <git@vexu.eu> 2021-06-13 15:23:31+03:00
log	6664679c8c1d24e929630daf8392ca09620d4a94
tree	42c4fa816d5b802a0e9609580c86c22eaf98a36a
parent	540b52931aeeee7c72c73361118d07ab986cf048

translate-c: don't bother with unwrapping pointers

Dereferencing a c pointer implicitly includes an unwrap,
manually adding it just causes bugs.

4 files changed, 36 insertions(+), 10 deletions(-)

src
- translate_c.zig
- translate_c
  - ast.zig
test
- run_translated_c.zig
- translate_c.zig

src/translate_c.zig+7-5

 @@ -1438,7 +1438,7 @@ fn transSimpleOffsetOfExpr(
             }
         }
     }
-    return fail(c, error.UnsupportedTranslation, expr.getBeginLoc(), "Failed to translate simple OffsetOfExpr", .{});
+    return fail(c, error.UnsupportedTranslation, expr.getBeginLoc(), "failed to translate simple OffsetOfExpr", .{});
 }
 fn transOffsetOfExpr(
 @@ -2619,7 +2619,7 @@ fn transInitListExpr(
     const source_loc = @ptrCast(*const clang.Expr, expr).getBeginLoc();
     if (qualTypeWasDemotedToOpaque(c, qt)) {
-        return fail(c, error.UnsupportedTranslation, source_loc, "Cannot initialize opaque type", .{});
+        return fail(c, error.UnsupportedTranslation, source_loc, "cannot initialize opaque type", .{});
     }
     if (qual_type.isRecordType()) {
 @@ -3408,7 +3408,7 @@ fn transUnaryExprOrTypeTraitExpr(
             c,
             error.UnsupportedTranslation,
             loc,
-            "Unsupported type trait kind {}",
+            "unsupported type trait kind {}",
             .{kind},
         ),
     }
 @@ -3450,13 +3450,15 @@ fn transUnaryOperator(c: *Context, scope: *Scope, stmt: *const clang.UnaryOperat
             return Tag.address_of.create(c.arena, try transExpr(c, scope, op_expr, used));
         },
         .Deref => {
+            if (qualTypeWasDemotedToOpaque(c, stmt.getType()))
+                return fail(c, error.UnsupportedTranslation, stmt.getBeginLoc(), "cannot dereference opaque type", .{});
             const node = try transExpr(c, scope, op_expr, used);
             var is_ptr = false;
             const fn_ty = qualTypeGetFnProto(op_expr.getType(), &is_ptr);
             if (fn_ty != null and is_ptr)
                 return node;
-            const unwrapped = try Tag.unwrap.create(c.arena, node);
+            return Tag.deref.create(c.arena, node);
-            return Tag.deref.create(c.arena, unwrapped);
         },
         .Plus => return transExpr(c, scope, op_expr, used),
         .Minus => {

src/translate_c/ast.zig+1-1

...	@@ -2294,7 +2294,6 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex {	...	@@ -2294,7 +2294,6 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex {
2294	.single_pointer,	2294	.single_pointer,
2295	.unwrap,	2295	.unwrap,
2296	.deref,	2296	.deref,
2297	.address_of,
2298	.not,	2297	.not,
2299	.negate,	2298	.negate,
2300	.negate_wrap,	2299	.negate_wrap,
...	@@ -2349,6 +2348,7 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex {	...	@@ -2349,6 +2348,7 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex {
2349	.container_init,	2348	.container_init,
2350	.container_init_dot,	2349	.container_init_dot,
2351	.block,	2350	.block,
		2351	.address_of,
2352	=> return c.addNode(.{	2352	=> return c.addNode(.{
2353	.tag = .grouped_expression,	2353	.tag = .grouped_expression,
2354	.main_token = try c.addToken(.l_paren, "("),	2354	.main_token = try c.addToken(.l_paren, "("),

test/run_translated_c.zig+10

...	@@ -3,6 +3,16 @@ const tests = @import("tests.zig");	...	@@ -3,6 +3,16 @@ const tests = @import("tests.zig");
3	const nl = std.cstr.line_sep;	3	const nl = std.cstr.line_sep;
4		4
5	pub fn addCases(cases: *tests.RunTranslatedCContext) void {	5	pub fn addCases(cases: *tests.RunTranslatedCContext) void {
		6	cases.add("dereference address of",
		7	\\#include <stdlib.h>
		8	\\int main(void) {
		9	\\ int i = 0;
		10	\\ *&i = 42;
		11	\\ if (i != 42) abort();
		12	\\ return 0;
		13	\\}
		14	, "");
		15
6	cases.add("division of floating literals",	16	cases.add("division of floating literals",
7	\\#define _NO_CRT_STDIO_INLINE 1	17	\\#define _NO_CRT_STDIO_INLINE 1
8	\\#include <stdio.h>	18	\\#include <stdio.h>

test/translate_c.zig+18-4

 @@ -1515,7 +1515,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
     , &[_][]const u8{
         \\pub export fn foo() void {
         \\    var x: [*c]c_int = undefined;
-        \\    x.?.* = 1;
+        \\    x.* = 1;
         \\}
     });
 @@ -1529,7 +1529,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\pub export fn foo() c_int {
         \\    var x: c_int = 1234;
         \\    var ptr: [*c]c_int = &x;
-        \\    return ptr.?.*;
+        \\    return ptr.*;
         \\}
     });
 @@ -3243,7 +3243,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\            const tmp_2 = ref.*;
         \\            ref.* += 1;
         \\            break :blk_1 tmp_2;
-        \\        }).?.* = tmp;
+        \\        }).* = tmp;
         \\        break :blk tmp;
         \\    };
         \\}
 @@ -3583,12 +3583,26 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\    struct my_struct S = {.a = 1, .b = 2};
         \\}
     , &[_][]const u8{
-        \\warning: Cannot initialize opaque type
+        \\warning: cannot initialize opaque type
         ,
         \\warning: unable to translate function, demoted to extern
         \\pub extern fn initialize() void;
     });
+    cases.add("Demote function that dereferences opaque type",
+        \\struct my_struct {
+        \\    unsigned a: 1;
+        \\};
+        \\void deref(struct my_struct *s) {
+        \\    *s;
+        \\}
+    , &[_][]const u8{
+        \\warning: cannot dereference opaque type
+        ,
+        \\warning: unable to translate function, demoted to extern
+        \\pub extern fn deref(arg_s: ?*struct_my_struct) void;
+    });
     cases.add("Function prototype declared within function",
         \\int foo(void) {
         \\    extern int bar(int, int);