From f22dc4d581760d365392323a431f4787f31ae130 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 1 Feb 2011 18:02:57 -0800 Subject: Fix buggy argument assembly for upcall_get_type_desc. Can now complete calls to glue of derived tydescs. --- src/comp/middle/trans.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/comp') diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index c08147fe..c955340e 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -983,14 +983,14 @@ fn get_tydesc(&@block_ctxt cx, @ty.t t) -> result { auto root = cx.fcx.ccx.tydescs.get(t); auto tydescs = cx.build.Alloca(T_array(T_ptr(T_tydesc()), n_params)); + auto i = 0; + auto tdp = cx.build.GEP(tydescs, vec(C_int(0), C_int(i))); + cx.build.Store(root, tdp); + i += 1; for (ValueRef td in tys._1) { auto tdp = cx.build.GEP(tydescs, vec(C_int(0), C_int(i))); - if (i == 0) { - cx.build.Store(root, tdp); - } else { - cx.build.Store(td, tdp); - } + cx.build.Store(td, tdp); i += 1; } -- cgit v1.2.3