authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-03-25 19:39:30-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-03-25 19:39:30-07:00
log4fd3a2e8e82b1793329e329c5a8045bfd6f40a33
tree15b01af8ac92bec73057d06bfbb1873dfa3ceecc
parentb9c5a1fdf59b16b86d33cb52693e84478295b6a3

astgen: fix var decl source locations


2 files changed, 61 insertions(+), 61 deletions(-)

src/astgen.zig+4-4
...@@ -1240,7 +1240,7 @@ fn varDecl(...@@ -1240,7 +1240,7 @@ fn varDecl(
1240 .gen_zir = gz,1240 .gen_zir = gz,
1241 .name = ident_name,1241 .name = ident_name,
1242 .inst = init_inst,1242 .inst = init_inst,
1243 .src = gz.nodeSrcLoc(node),1243 .src = name_src,
1244 };1244 };
1245 return &sub_scope.base;1245 return &sub_scope.base;
1246 }1246 }
...@@ -1300,7 +1300,7 @@ fn varDecl(...@@ -1300,7 +1300,7 @@ fn varDecl(
1300 .gen_zir = gz,1300 .gen_zir = gz,
1301 .name = ident_name,1301 .name = ident_name,
1302 .inst = casted_init,1302 .inst = casted_init,
1303 .src = gz.nodeSrcLoc(node),1303 .src = name_src,
1304 };1304 };
1305 return &sub_scope.base;1305 return &sub_scope.base;
1306 }1306 }
...@@ -1328,7 +1328,7 @@ fn varDecl(...@@ -1328,7 +1328,7 @@ fn varDecl(
1328 .gen_zir = gz,1328 .gen_zir = gz,
1329 .name = ident_name,1329 .name = ident_name,
1330 .ptr = init_scope.rl_ptr,1330 .ptr = init_scope.rl_ptr,
1331 .src = gz.nodeSrcLoc(node),1331 .src = name_src,
1332 };1332 };
1333 return &sub_scope.base;1333 return &sub_scope.base;
1334 },1334 },
...@@ -1357,7 +1357,7 @@ fn varDecl(...@@ -1357,7 +1357,7 @@ fn varDecl(
1357 .gen_zir = gz,1357 .gen_zir = gz,
1358 .name = ident_name,1358 .name = ident_name,
1359 .ptr = var_data.alloc,1359 .ptr = var_data.alloc,
1360 .src = gz.nodeSrcLoc(node),1360 .src = name_src,
1361 };1361 };
1362 return &sub_scope.base;1362 return &sub_scope.base;
1363 },1363 },
test/stage2/test.zig+57-57
...@@ -1001,43 +1001,43 @@ pub fn addCases(ctx: *TestContext) !void {...@@ -1001,43 +1001,43 @@ pub fn addCases(ctx: *TestContext) !void {
1001 );1001 );
1002 }1002 }
10031003
1004 //{1004 {
1005 // var case = ctx.exe("basic import", linux_x64);1005 var case = ctx.exe("basic import", linux_x64);
1006 // case.addCompareOutput(1006 case.addCompareOutput(
1007 // \\export fn _start() noreturn {1007 \\export fn _start() noreturn {
1008 // \\ @import("print.zig").print();1008 \\ @import("print.zig").print();
1009 // \\ exit();1009 \\ exit();
1010 // \\}1010 \\}
1011 // \\1011 \\
1012 // \\fn exit() noreturn {1012 \\fn exit() noreturn {
1013 // \\ asm volatile ("syscall"1013 \\ asm volatile ("syscall"
1014 // \\ :1014 \\ :
1015 // \\ : [number] "{rax}" (231),1015 \\ : [number] "{rax}" (231),
1016 // \\ [arg1] "{rdi}" (@as(usize, 0))1016 \\ [arg1] "{rdi}" (@as(usize, 0))
1017 // \\ : "rcx", "r11", "memory"1017 \\ : "rcx", "r11", "memory"
1018 // \\ );1018 \\ );
1019 // \\ unreachable;1019 \\ unreachable;
1020 // \\}1020 \\}
1021 // ,1021 ,
1022 // "Hello, World!\n",1022 "Hello, World!\n",
1023 // );1023 );
1024 // try case.files.append(.{1024 try case.files.append(.{
1025 // .src =1025 .src =
1026 // \\pub fn print() void {1026 \\pub fn print() void {
1027 // \\ asm volatile ("syscall"1027 \\ asm volatile ("syscall"
1028 // \\ :1028 \\ :
1029 // \\ : [number] "{rax}" (@as(usize, 1)),1029 \\ : [number] "{rax}" (@as(usize, 1)),
1030 // \\ [arg1] "{rdi}" (@as(usize, 1)),1030 \\ [arg1] "{rdi}" (@as(usize, 1)),
1031 // \\ [arg2] "{rsi}" (@ptrToInt("Hello, World!\n")),1031 \\ [arg2] "{rsi}" (@ptrToInt("Hello, World!\n")),
1032 // \\ [arg3] "{rdx}" (@as(usize, 14))1032 \\ [arg3] "{rdx}" (@as(usize, 14))
1033 // \\ : "rcx", "r11", "memory"1033 \\ : "rcx", "r11", "memory"
1034 // \\ );1034 \\ );
1035 // \\ return;1035 \\ return;
1036 // \\}1036 \\}
1037 // ,1037 ,
1038 // .path = "print.zig",1038 .path = "print.zig",
1039 // });1039 });
1040 //}1040 }
10411041
1042 ctx.compileError("function redefinition", linux_x64,1042 ctx.compileError("function redefinition", linux_x64,
1043 \\fn entry() void {}1043 \\fn entry() void {}
...@@ -1051,26 +1051,26 @@ pub fn addCases(ctx: *TestContext) !void {...@@ -1051,26 +1051,26 @@ pub fn addCases(ctx: *TestContext) !void {
1051 \\}1051 \\}
1052 , &[_][]const u8{":2:3: error: this is an error"});1052 , &[_][]const u8{":2:3: error: this is an error"});
10531053
1054 //{1054 {
1055 // var case = ctx.obj("variable shadowing", linux_x64);1055 var case = ctx.obj("variable shadowing", linux_x64);
1056 // case.addError(1056 case.addError(
1057 // \\export fn _start() noreturn {1057 \\export fn _start() noreturn {
1058 // \\ var i: u32 = 10;1058 \\ var i: u32 = 10;
1059 // \\ var i: u32 = 10;1059 \\ var i: u32 = 10;
1060 // \\ unreachable;1060 \\ unreachable;
1061 // \\}1061 \\}
1062 // , &[_][]const u8{1062 , &[_][]const u8{
1063 // ":3:9: error: redefinition of 'i'",1063 ":3:9: error: redefinition of 'i'",
1064 // ":2:9: note: previous definition is here",1064 ":2:9: note: previous definition is here",
1065 // });1065 });
1066 // case.addError(1066 case.addError(
1067 // \\var testing: i64 = 10;1067 \\var testing: i64 = 10;
1068 // \\export fn _start() noreturn {1068 \\export fn _start() noreturn {
1069 // \\ var testing: i64 = 20;1069 \\ var testing: i64 = 20;
1070 // \\ unreachable;1070 \\ unreachable;
1071 // \\}1071 \\}
1072 // , &[_][]const u8{":3:9: error: redefinition of 'testing'"});1072 , &[_][]const u8{":3:9: error: redefinition of 'testing'"});
1073 //}1073 }
10741074
1075 //{1075 //{
1076 // // TODO make the test harness support checking the compile log output too1076 // // TODO make the test harness support checking the compile log output too