Use gvars for vtbls rather than returning const immediates.

graydon · graydon · commit 490da3564be0 · 2010-12-20T11:41:32.000-08:00
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -2355,7 +2355,13 @@ impure fn trans_vtbl(@crate_ctxt cx, &ast._obj ob) -> ValueRef {`
`2355`	`2355`	`trans_fn(cx, m.node.meth, m.node.id, m.node.ann);`
`2356`	`2356`	`methods += llfn;`
`2357`	`2357`	`}`
`2358`		`- ret C_struct(methods);`
	`2358`	`+ auto vtbl = C_struct(methods);`
	`2359`	`+ auto gvar = llvm.LLVMAddGlobal(cx.llmod,`
	`2360`	`+ val_ty(vtbl),`
	`2361`	`+ _str.buf("_rust_vtbl" + "." + cx.path));`
	`2362`	`+ llvm.LLVMSetInitializer(gvar, vtbl);`
	`2363`	`+ llvm.LLVMSetGlobalConstant(gvar, True);`
	`2364`	`+ ret gvar;`
`2359`	`2365`	`}`
`2360`	`2366`
`2361`	`2367`	`impure fn trans_obj(@crate_ctxt cx, &ast._obj ob, ast.def_id oid,`