Update from https://crrev.com/305340

base/debug/proc_maps_linux_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/proc_maps_linux.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
+#include "base/threading/platform_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace debug {
 
 TEST(ProcMapsTest, Empty) {
   std::vector<MappedMemoryRegion> regions;
   EXPECT_TRUE(ParseProcMaps("", &regions));
   EXPECT_EQ(0u, regions.size());
 }
@@ skipping 170 matching lines @@
 
   // We should be able to find both the current executable as well as the stack
   // mapped into memory. Use the address of |proc_maps| as a way of finding the
   // stack.
   FilePath exe_path;
   EXPECT_TRUE(PathService::Get(FILE_EXE, &exe_path));
   uintptr_t address = reinterpret_cast<uintptr_t>(&proc_maps);
   bool found_exe = false;
   bool found_stack = false;
   bool found_address = false;
+
+  // Valgrind uses its own allocated stacks instead of the kernel-provided stack
+  // without letting the kernel know via prctl(PR_SET_MM_START_STACK). This
+  // causes the kernel to use [stack:TID] format. See http://crbug.com/431702
+  // for details.
+  std::string stack_with_tid =
+      StringPrintf("[stack:%d]", PlatformThread::CurrentId());
+
   for (size_t i = 0; i < regions.size(); ++i) {
     if (regions[i].path == exe_path.value()) {
       // It's OK to find the executable mapped multiple times as there'll be
       // multiple sections (e.g., text, data).
       found_exe = true;
     }
 
+    bool is_correct_stack = false;
     if (regions[i].path == "[stack]") {
-      // Only check if |address| lies within the real stack when not running
-      // Valgrind, otherwise |address| will be on a stack that Valgrind creates.
-      if (!RunningOnValgrind()) {
-        EXPECT_GE(address, regions[i].start);
-        EXPECT_LT(address, regions[i].end);
-      }
+      is_correct_stack = true;
+      EXPECT_FALSE(RunningOnValgrind());
+      EXPECT_GE(address, regions[i].start);
+      EXPECT_LT(address, regions[i].end);
+    } else if (regions[i].path == stack_with_tid) {
+      is_correct_stack = true;
+      EXPECT_TRUE(RunningOnValgrind());
+    }
 
+    if (is_correct_stack) {
+      // Note that the stack is executable when it is created by Valgrind.
       EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::READ);
       EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::WRITE);
-      EXPECT_FALSE(regions[i].permissions & MappedMemoryRegion::EXECUTE);
+      EXPECT_EQ(RunningOnValgrind(),
+                (regions[i].permissions & MappedMemoryRegion::EXECUTE) != 0);
       EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::PRIVATE);
       EXPECT_FALSE(found_stack) << "Found duplicate stacks";
       found_stack = true;
     }
 
     if (address >= regions[i].start && address < regions[i].end) {
       EXPECT_FALSE(found_address) << "Found same address in multiple regions";
       found_address = true;
     }
   }
@@ skipping 76 matching lines @@
   EXPECT_EQ(5ULL, regions.size());
   EXPECT_EQ("/bin/cat", regions[0].path);
   EXPECT_EQ("/lib/x86_64-linux-gnu/libc-2.15.so", regions[1].path);
   EXPECT_EQ("/lib/x86_64-linux-gnu/ld-2.15.so", regions[2].path);
   EXPECT_EQ("\"vd so\"", regions[3].path);
   EXPECT_EQ("[vsys call]", regions[4].path);
 }
 
 }  // namespace debug
 }  // namespace base