diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-08-20 18:35:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 18:35:31 -0400 |
| commit | 9cfcd0c29677e11f76846b006757ff49e05e3d6f (patch) | |
| tree | 285973ffaab76ee3ca831a9663f15be62c44d32b /src/codegen.cpp | |
| parent | 1ca49b92c650e9b8988a35983e202cdb9c7ba6e7 (diff) | |
| parent | 717e2a365d9b5103f855668e4765cc154203a2bf (diff) | |
| download | zig-9cfcd0c29677e11f76846b006757ff49e05e3d6f.tar.gz zig-9cfcd0c29677e11f76846b006757ff49e05e3d6f.zip | |
Merge pull request #6103 from Vexu/extern
Disallow extern variables with initializers.
Diffstat (limited to 'src/codegen.cpp')
| -rw-r--r-- | src/codegen.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index 36ed520069..e2341fe1aa 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -292,13 +292,14 @@ static void add_uwtable_attr(CodeGen *g, LLVMValueRef fn_val) { } } -static LLVMLinkage to_llvm_linkage(GlobalLinkageId id) { +static LLVMLinkage to_llvm_linkage(GlobalLinkageId id, bool is_extern) { switch (id) { case GlobalLinkageIdInternal: return LLVMInternalLinkage; case GlobalLinkageIdStrong: return LLVMExternalLinkage; case GlobalLinkageIdWeak: + if (is_extern) return LLVMExternalWeakLinkage; return LLVMWeakODRLinkage; case GlobalLinkageIdLinkOnce: return LLVMLinkOnceODRLinkage; @@ -521,7 +522,7 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) { } - LLVMSetLinkage(llvm_fn, to_llvm_linkage(linkage)); + LLVMSetLinkage(llvm_fn, to_llvm_linkage(linkage, fn->body_node == nullptr)); if (linkage == GlobalLinkageIdInternal) { LLVMSetUnnamedAddr(llvm_fn, true); @@ -7962,7 +7963,7 @@ static void do_code_gen(CodeGen *g) { global_value = LLVMAddGlobal(g->module, get_llvm_type(g, var->var_type), symbol_name); // TODO debug info for the extern variable - LLVMSetLinkage(global_value, to_llvm_linkage(linkage)); + LLVMSetLinkage(global_value, to_llvm_linkage(linkage, true)); maybe_import_dll(g, global_value, GlobalLinkageIdStrong); LLVMSetAlignment(global_value, var->align_bytes); LLVMSetGlobalConstant(global_value, var->gen_is_const); @@ -7975,7 +7976,7 @@ static void do_code_gen(CodeGen *g) { global_value = var->const_value->llvm_global; if (exported) { - LLVMSetLinkage(global_value, to_llvm_linkage(linkage)); + LLVMSetLinkage(global_value, to_llvm_linkage(linkage, false)); maybe_export_dll(g, global_value, GlobalLinkageIdStrong); } if (var->section_name) { |