From 93686fc6f1a151eb00e8d7aa6c6dac89a1714132 Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Tue, 12 Feb 2013 10:46:39 +0000
Subject: [PATCH] [MSan] symbolize correct PC when printing Summary message

llvm-svn: 174956
---
 compiler-rt/lib/msan/msan_report.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/msan/msan_report.cc b/compiler-rt/lib/msan/msan_report.cc
index 26f34d7b8f38..d4a6d3018421 100644
--- a/compiler-rt/lib/msan/msan_report.cc
+++ b/compiler-rt/lib/msan/msan_report.cc
@@ -71,7 +71,8 @@ static void DescribeOrigin(u32 origin) {
 static void ReportSummary(const char *error_type, StackTrace *stack) {
   if (!stack->size || !IsSymbolizerAvailable()) return;
   AddressInfo ai;
-  SymbolizeCode(stack->trace[0], &ai, 1);
+  uptr pc = StackTrace::GetPreviousInstructionPc(stack->trace[0]);
+  SymbolizeCode(pc, &ai, 1);
   ReportErrorSummary(error_type,
                      StripPathPrefix(ai.file, flags()->strip_path_prefix),
                      ai.line, ai.function);
-- 
2.34.1