---

graydon · graydon · commit 3f02c4733235 · 2012-04-02T15:26:12.000-07:00
yaml --- r: 12274 b: refs/heads/master c: 987bc23 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dd63c5ef1d55210cf9905295d9c33c622797fb72
+refs/heads/master: 987bc2362926d0672a01e8d5964940743df48cb6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rustc/middle/trans/base.rs b/trunk/src/rustc/middle/trans/base.rs
@@ -1045,8 +1045,6 @@ fn call_tydesc_glue_full(cx: block, v: ValueRef, tydesc: ValueRef,
     }
 
     let llrawptr = PointerCast(cx, v, T_ptr(T_i8()));
-    let lltydescs = GEPi(cx, tydesc, [0, abi::tydesc_field_first_param]);
-    let lltydescs = Load(cx, lltydescs);
 
     let llfn = {
         alt static_glue_fn {
@@ -1059,7 +1057,7 @@ fn call_tydesc_glue_full(cx: block, v: ValueRef, tydesc: ValueRef,
     };
 
     Call(cx, llfn, [C_null(T_ptr(T_nil())), C_null(T_ptr(T_nil())),
-                    lltydescs, llrawptr]);
+                    C_null(T_ptr(T_ptr(cx.ccx().tydesc_type))), llrawptr]);
 }
 
 fn call_tydesc_glue(cx: block, v: ValueRef, t: ty::t, field: int) ->

Original file line number	Diff line number	Diff line change
`@@ -1045,8 +1045,6 @@ fn call_tydesc_glue_full(cx: block, v: ValueRef, tydesc: ValueRef,`
`1045`	`1045`	`}`
`1046`	`1046`
`1047`	`1047`	`let llrawptr = PointerCast(cx, v, T_ptr(T_i8()));`
`1048`		`- let lltydescs = GEPi(cx, tydesc, [0, abi::tydesc_field_first_param]);`
`1049`		`- let lltydescs = Load(cx, lltydescs);`
`1050`	`1048`
`1051`	`1049`	`let llfn = {`
`1052`	`1050`	`alt static_glue_fn {`
`@@ -1059,7 +1057,7 @@ fn call_tydesc_glue_full(cx: block, v: ValueRef, tydesc: ValueRef,`
`1059`	`1057`	`};`
`1060`	`1058`
`1061`	`1059`	`Call(cx, llfn, [C_null(T_ptr(T_nil())), C_null(T_ptr(T_nil())),`
`1062`		`- lltydescs, llrawptr]);`
	`1060`	`+ C_null(T_ptr(T_ptr(cx.ccx().tydesc_type))), llrawptr]);`
`1063`	`1061`	`}`
`1064`	`1062`
`1065`	`1063`	`fn call_tydesc_glue(cx: block, v: ValueRef, t: ty::t, field: int) ->`