Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 19941 invoked from network); 13 Feb 2008 15:30:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2008 15:30:35 -0000 Received: (qmail 47767 invoked by uid 500); 13 Feb 2008 15:30:29 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 47750 invoked by uid 500); 13 Feb 2008 15:30:29 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 47741 invoked by uid 99); 13 Feb 2008 15:30:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2008 07:30:29 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2008 15:30:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7A701A9838; Wed, 13 Feb 2008 07:30:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r627473 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/stack_dump_platf.cpp Date: Wed, 13 Feb 2008 15:30:14 -0000 To: commits@harmony.apache.org From: gshimansky@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080213153014.A7A701A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gshimansky Date: Wed Feb 13 07:30:12 2008 New Revision: 627473 URL: http://svn.apache.org/viewvc?rev=627473&view=rev Log: Applied patch from HARMONY-5497 [drlvm][signals] Crash handler does not show line info on Win/x86_64 Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/stack_dump_platf.cpp Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/stack_dump_platf.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/stack_dump_platf.cpp?rev=627473&r1=627472&r2=627473&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/stack_dump_platf.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/stack_dump_platf.cpp Wed Feb 13 07:30:12 2008 @@ -75,6 +75,7 @@ if (hdbghelp) { + SymSetOptions(SYMOPT_LOAD_LINES); g_SymFromAddr = (SymFromAddr_type)::GetProcAddress(hdbghelp, "SymFromAddr"); g_SymGetLineFromAddr64 = (SymGetLineFromAddr64_type)::GetProcAddress(hdbghelp, "SymGetLineFromAddr64"); g_SymGetLineFromAddr = (SymGetLineFromAddr_type)::GetProcAddress(hdbghelp, "SymGetLineFromAddr"); @@ -176,6 +177,8 @@ { DWORD offset; IMAGEHLP_LINE64 lineinfo; + lineinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + if (g_SymGetLineFromAddr64(GetCurrentProcess(), (DWORD64)(POINTER_SIZE_INT)ip, &offset, &lineinfo)) @@ -190,6 +193,8 @@ { DWORD offset; IMAGEHLP_LINE lineinfo; + lineinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE); + if (g_SymGetLineFromAddr(GetCurrentProcess(), (DWORD)(POINTER_SIZE_INT)ip, &offset, &lineinfo))