From 0c4e0fdfae2fad4a132bdfef3cb856ec5dde84c9 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 23 Sep 2011 16:51:50 -0700 Subject: rt: Get rid of the hack that looks for captured type descriptors adjacent to the root one for functions and objects --- src/rt/rust_obstack.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/rt/rust_obstack.cpp') diff --git a/src/rt/rust_obstack.cpp b/src/rt/rust_obstack.cpp index 99e72489f5f..e8dbffd74a2 100644 --- a/src/rt/rust_obstack.cpp +++ b/src/rt/rust_obstack.cpp @@ -160,12 +160,13 @@ rust_obstack::dump() const { iterator b = begin(), e = end(); while (b != e) { std::pair data = *b; + uint8_t *dp = reinterpret_cast(data.second); + shape::arena arena; shape::type_param *params = - shape::type_param::from_tydesc(&data.first, arena); + shape::type_param::from_tydesc_and_data(data.first, dp, arena); shape::log log(task, true, data.first->shape, params, - data.first->shape_tables, - reinterpret_cast(data.second), std::cerr); + data.first->shape_tables, dp, std::cerr); log.walk(); std::cerr << "\n"; -- cgit 1.4.1-3-g733a5