From 490da3564be081eb40a711e83ae05fe07d5c6d2c Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Mon, 20 Dec 2010 11:41:22 -0800 Subject: [PATCH] Use gvars for vtbls rather than returning const immediates. --- src/comp/middle/trans.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index d4cd64bdc5f..3388b10099a 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -2355,7 +2355,13 @@ impure fn trans_vtbl(@crate_ctxt cx, &ast._obj ob) -> ValueRef { trans_fn(cx, m.node.meth, m.node.id, m.node.ann); methods += llfn; } - ret C_struct(methods); + auto vtbl = C_struct(methods); + auto gvar = llvm.LLVMAddGlobal(cx.llmod, + val_ty(vtbl), + _str.buf("_rust_vtbl" + "." + cx.path)); + llvm.LLVMSetInitializer(gvar, vtbl); + llvm.LLVMSetGlobalConstant(gvar, True); + ret gvar; } impure fn trans_obj(@crate_ctxt cx, &ast._obj ob, ast.def_id oid,