[asan] Hopefully fix the RTL build on Windows (part 2)

llvm-svn: 189817
This commit is contained in:
Timur Iskhodzhanov 2013-09-03 15:09:21 +00:00
parent 4e27d1fdaf
commit 2b8d35f8ac
1 changed files with 2 additions and 2 deletions

View File

@ -340,7 +340,7 @@ bool DescribeAddressIfStack(uptr addr, uptr access_size) {
PrintStack(&alloca_stack); PrintStack(&alloca_stack);
// Report the number of stack objects. // Report the number of stack objects.
char *p; 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); CHECK_GT(n_objects, 0);
Printf(" This frame has %zu object(s):\n", n_objects); 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, internal_strncat(buf, vars[i].name_pos,
static_cast<uptr>(Min(kBufSize, vars[i].name_len))); static_cast<uptr>(Min(kBufSize, vars[i].name_len)));
uptr prev_var_end = i ? vars[i - 1].beg + vars[i - 1].size : 0; 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, PrintAccessAndVarIntersection(buf, vars[i].beg, vars[i].size,
offset, access_size, offset, access_size,
prev_var_end, next_var_beg); prev_var_end, next_var_beg);