[compiler-rt] r189817 - [asan] Hopefully fix the RTL build on Windows (part 2)

[Timur Iskhodzhanov]

Author: timurrrr
Date: Tue Sep  3 10:09:21 2013
New Revision: 189817

URL: http://llvm.org/viewvc/llvm-project?rev=189817&view=rev
Log:
[asan] Hopefully fix the RTL build on Windows (part 2)

Modified:
    compiler-rt/trunk/lib/asan/asan_report.cc

Modified: compiler-rt/trunk/lib/asan/asan_report.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=189817&r1=189816&r2=189817&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_report.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_report.cc Tue Sep  3 10:09:21 2013
@@ -340,7 +340,7 @@ bool DescribeAddressIfStack(uptr addr, u
   PrintStack(&alloca_stack);
   // Report the number of stack objects.
   char *p;
-  u64 n_objects = (uptr)internal_simple_strtoll(frame_descr, &p, 10);
+  uptr n_objects = (uptr)internal_simple_strtoll(frame_descr, &p, 10);
   CHECK_GT(n_objects, 0);
   Printf("  This frame has %zu object(s):\n", n_objects);
 
@@ -369,7 +369,7 @@ bool DescribeAddressIfStack(uptr addr, u
     internal_strncat(buf, vars[i].name_pos,
                      static_cast<uptr>(Min(kBufSize, vars[i].name_len)));
     uptr prev_var_end = i ? vars[i - 1].beg + vars[i - 1].size : 0;
-    uptr next_var_beg = i < n_objects - 1 ? vars[i + 1].beg : ~(0UL);
+    uptr next_var_beg = i + 1 < n_objects ? vars[i + 1].beg : ~(0UL);
     PrintAccessAndVarIntersection(buf, vars[i].beg, vars[i].size,
                                   offset, access_size,
                                   prev_var_end, next_var_beg);