From 9e60c89601ab205cd3e63215b318beb89ad1b471 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 8 Mar 2020 03:53:06 -0400 Subject: [PATCH] Revert "Translate C: Group generated casts" This reverts commit 895672b3f96aab1f5bad3446f5186a047f29412c. --- src-self-hosted/translate_c.zig | 41 ++++----------------------------- test/run_translated_c.zig | 18 --------------- test/translate_c.zig | 24 ++++--------------- 3 files changed, 9 insertions(+), 74 deletions(-) diff --git a/src-self-hosted/translate_c.zig b/src-self-hosted/translate_c.zig index b13a0d4bf975e8f40448914d616fccfdf51dc2c9..d24001cf9425efe4cd563d73f5da8f0329f95034 100644 --- a/src-self-hosted/translate_c.zig +++ b/src-self-hosted/translate_c.zig @@ -5424,15 +5424,12 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, return error.ParseError; } - // TODO: It might be nice if we only did the alignCasting for opaque types - //( if (@typeInfo(@TypeOf(x)) == .Pointer) - // @ptrCast(dest, @alignCast(@alignOf(dest.Child), x)) + //if (@typeInfo(@TypeOf(x)) == .Pointer) + // @ptrCast(dest, x) //else if (@typeInfo(@TypeOf(x)) == .Integer) // @intToPtr(dest, x) //else - // @as(dest, x) ) - - const group_lparen = try appendToken(c, .LParen, "("); + // @as(dest, x) const if_1 = try transCreateNodeIf(c); const type_id_1 = try transCreateNodeBuiltinFnCall(c, "@typeInfo"); @@ -5452,30 +5449,9 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, if_1.condition = &cmp_1.base; _ = try appendToken(c, .RParen, ")"); - const period_tok = try appendToken(c, .Period, "."); - const child_ident = try transCreateNodeIdentifier(c, "Child"); - const inner_node_child = try c.a().create(ast.Node.InfixOp); - inner_node_child.* = .{ - .op_token = period_tok, - .lhs = inner_node, - .op = .Period, - .rhs = child_ident, - }; - - const align_of = try transCreateNodeBuiltinFnCall(c, "@alignOf"); - try align_of.params.push(&inner_node_child.base); - align_of.rparen_token = try appendToken(c, .RParen, ")"); - // hack to get zig fmt to render a comma in builtin calls - _ = try appendToken(c, .Comma, ","); - - const align_cast = try transCreateNodeBuiltinFnCall(c, "@alignCast"); - try align_cast.params.push(&align_of.base); - try align_cast.params.push(node_to_cast); - align_cast.rparen_token = try appendToken(c, .RParen, ")"); - const ptr_cast = try transCreateNodeBuiltinFnCall(c, "@ptrCast"); try ptr_cast.params.push(inner_node); - try ptr_cast.params.push(&align_cast.base); + try ptr_cast.params.push(node_to_cast); ptr_cast.rparen_token = try appendToken(c, .RParen, ")"); if_1.body = &ptr_cast.base; @@ -5516,14 +5492,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, as.rparen_token = try appendToken(c, .RParen, ")"); else_2.body = &as.base; - const group_rparen = try appendToken(c, .RParen, ")"); - const grouped_expr = try c.a().create(ast.Node.GroupedExpression); - grouped_expr.* = .{ - .lparen = group_lparen, - .expr = &if_1.base, - .rparen = group_rparen, - }; - return &grouped_expr.base; + return &if_1.base; }, else => { const first_tok = it.list.at(0); diff --git a/test/run_translated_c.zig b/test/run_translated_c.zig index 313a83705cfff31e0a4c46ed8ba2e6a85c7fff4f..629a850836ddc334f92eab5f87b2675d50897627 100644 --- a/test/run_translated_c.zig +++ b/test/run_translated_c.zig @@ -195,22 +195,4 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void { \\ return 0; \\} , ""); - - cases.add("cast from pointer to opaque type to struct", - \\#include - \\typedef struct - \\{ - \\ int i; - \\} - \\StructType,*StructPtrType; - \\ - \\typedef struct OpaqueStruct OpaqueStructTypedef; - \\#define Macro(opaquePtr) (((StructPtrType)(opaquePtr))->i) - \\int main(int argc, char **argv) { - \\ StructType localStruct = {88}; - \\ OpaqueStructTypedef *opaquePtrToLocal = &localStruct; - \\ printf("%d!\n", Macro(opaquePtrToLocal)); - \\ return 0; - \\} - , "88!\n"); } diff --git a/test/translate_c.zig b/test/translate_c.zig index 01614ae9c9272e7b6c6fcf5931c14c3d292e8272..3d0843d272f96fb9e12a64419113c56a0591bf15 100644 --- a/test/translate_c.zig +++ b/test/translate_c.zig @@ -1404,7 +1404,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void { cases.add("macro pointer cast", \\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE) , &[_][]const u8{ - \\pub const NRF_GPIO = (if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, @alignCast(@alignOf([*c]NRF_GPIO_Type.Child), NRF_GPIO_BASE)) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE)); + \\pub const NRF_GPIO = if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE); }); cases.add("basic macro function", @@ -2588,11 +2588,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void { \\#define FOO(bar) baz((void *)(baz)) \\#define BAR (void*) a , &[_][]const u8{ - \\pub inline fn FOO(bar: var) @TypeOf(baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), baz)) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)))) { - \\ return baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), baz)) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz))); + \\pub inline fn FOO(bar: var) @TypeOf(baz(if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz))) { + \\ return baz(if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)); \\} , - \\pub const BAR = (if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), a)) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a)); + \\pub const BAR = if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, a) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a); }); cases.add("macro conditional operator", @@ -2754,20 +2754,4 @@ pub fn addCases(cases: *tests.TranslateCContext) void { \\ return if (x > y) x else y; \\} }); - - cases.add("Make sure casts are grouped", - \\typedef struct - \\{ - \\ int i; - \\} - \\*_XPrivDisplay; - \\typedef struct _XDisplay Display; - \\#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen) - \\ - , &[_][]const u8{ - \\pub inline fn DefaultScreen(dpy: var) @TypeOf((if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen) { - \\ return (if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen; - \\} - }); - } -- 2.54.0