asan_test.cc: Sync from upstream.

	* g++.dg/asan/asan_test.cc: Sync from upstream.
	* g++.dg/asan/asan_test_utils.h: Likewise.

From-SVN: r194356

gcc/testsuite/ChangeLog

+2012-12-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/asan/asan_test.cc: Sync from upstream.
+	* g++.dg/asan/asan_test_utils.h: Likewise.
+
 2012-12-10  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* gcc.target/arm/neon/vrndaf32.c: New test.

gcc/testsuite/g++.dg/asan/asan_test.cc

@@ -1604,7 +1604,7 @@ NOINLINE static int LargeFunction(bool do_bad_access) {
 TEST(AddressSanitizer, DISABLED_LargeFunctionSymbolizeTest) {
   int failing_line = LargeFunction(false);
   char expected_warning[128];
-  sprintf(expected_warning, "LargeFunction.*asan_test.cc:%d", failing_line);
+  sprintf(expected_warning, "LargeFunction.*asan_test.*:%d", failing_line);
   EXPECT_DEATH(LargeFunction(true), expected_warning);
 }
 
@@ -1748,7 +1748,7 @@ TEST(AddressSanitizer, FileNameInGlobalReportTest) {
   static char zoo[10];
   const char *p = Ident(zoo);
   // The file name should be present in the report.
-  EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test.cc");
+  EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test.");
 }
 
 int *ReturnsPointerToALocalObject() {

gcc/testsuite/g++.dg/asan/asan_test_utils.h

@@ -53,7 +53,7 @@ typedef __int64          int64_t;
 
 // Make the compiler thinks that something is going on there.
 inline void break_optimization(void *arg) {
-  __asm__ __volatile__ ("" : : "r" (arg) : "memory");
+  __asm__ __volatile__("" : : "r" (arg) : "memory");
 }
 
 // This function returns its parameter but in such a way that compiler