summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur Iskhodzhanov <timurrrr@google.com>2013-09-03 15:09:21 +0000
committerTimur Iskhodzhanov <timurrrr@google.com>2013-09-03 15:09:21 +0000
commit22917e961033a840c500761d3c7110b5a654fca4 (patch)
tree13c09a768c98ef5e0ca7aaeef2840dfac422fe41
parent8cde5cb6b7020d079f8db3e389a02df7a007f017 (diff)
[asan] Hopefully fix the RTL build on Windows (part 2)
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@189817 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/asan_report.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asan/asan_report.cc b/lib/asan/asan_report.cc
index c13e00b88..f91198e38 100644
--- a/lib/asan/asan_report.cc
+++ b/lib/asan/asan_report.cc
@@ -340,7 +340,7 @@ bool DescribeAddressIfStack(uptr addr, uptr access_size) {
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, uptr access_size) {
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);