From adc2aed587d009c0d112063fa0f3d03dedc9e50a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 16 Apr 2021 15:50:28 -0700 Subject: AstGen: require `@import` operand to be string literal See #2206 --- src/Sema.zig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Sema.zig') diff --git a/src/Sema.zig b/src/Sema.zig index eaea6961e8..6272293743 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -3900,10 +3900,9 @@ fn zirImport(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError! defer tracy.end(); const mod = sema.mod; - const inst_data = sema.code.instructions.items(.data)[inst].un_node; + const inst_data = sema.code.instructions.items(.data)[inst].str_tok; const src = inst_data.src(); - const operand_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = inst_data.src_node }; - const operand = try sema.resolveConstString(block, operand_src, inst_data.operand); + const operand = inst_data.get(sema.code); const file = mod.importFile(block.getFileScope().pkg, operand) catch |err| switch (err) { error.ImportOutsidePkgPath => { -- cgit v1.2.3