From 3bc7d3da42280cc96265818918405dcf97e4087c Mon Sep 17 00:00:00 2001
From: klutzy <klutzytheklutzy@gmail.com>
Date: Mon, 22 Sep 2014 01:25:57 +0900
Subject: [PATCH] std::rt::backtrace: Fix symbol names on Windows

Fixes #17372
---
 src/libstd/rt/backtrace.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index f4887a143d1..de5c26e03a3 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -701,7 +701,7 @@ mod imp {
     static IMAGE_FILE_MACHINE_IA64: libc::DWORD = 0x0200;
     static IMAGE_FILE_MACHINE_AMD64: libc::DWORD = 0x8664;
 
-    #[repr(C, packed)]
+    #[repr(C)]
     struct SYMBOL_INFO {
         SizeOfStruct: libc::c_ulong,
         TypeIndex: libc::c_ulong,
@@ -983,8 +983,10 @@ mod imp {
             try!(write!(w, "  {:2}: {:#2$x}", i, addr, super::HEX_WIDTH));
             let mut info: SYMBOL_INFO = unsafe { intrinsics::init() };
             info.MaxNameLen = MAX_SYM_NAME as libc::c_ulong;
-            info.SizeOfStruct = (mem::size_of::<SYMBOL_INFO>() -
-                                 info.Name.len() + 1) as libc::c_ulong;
+            // the struct size in C.  the value is different to
+            // `size_of::<SYMBOL_INFO>() - MAX_SYM_NAME + 1` (== 81)
+            // due to struct alignment.
+            info.SizeOfStruct = 88;
 
             let mut displacement = 0u64;
             let ret = SymFromAddr(process, addr as u64, &mut displacement,