dragonegg/test/validator/c++: Update a couple of testcases corresponding to LLVM r219010.

llvm-svn: 219614
diff --git a/dragonegg/test/validator/c++/2006-11-20-GlobalSymbols.cpp b/dragonegg/test/validator/c++/2006-11-20-GlobalSymbols.cpp
index 818f740..bf81357 100644
--- a/dragonegg/test/validator/c++/2006-11-20-GlobalSymbols.cpp
+++ b/dragonegg/test/validator/c++/2006-11-20-GlobalSymbols.cpp
@@ -4,7 +4,7 @@
 // functions.
 
 // CHECK: @"\01f\01oo" = unnamed_addr global i32 0
-// CHECK: metadata !"foo"{{.*}} @"\01f\01oo",
+// CHECK: metadata !{metadata !"0x34\00foo\00foo\00\01f\01oo\009\000\001", metadata !6, metadata !6, metadata !9, i32* @"\01f\01oo", null}
 
 int foo __asm__("f\001oo");
 
diff --git a/dragonegg/test/validator/c++/2010-07-23-DeclLoc.cpp b/dragonegg/test/validator/c++/2010-07-23-DeclLoc.cpp
index 61cf4a7..33373b7 100644
--- a/dragonegg/test/validator/c++/2010-07-23-DeclLoc.cpp
+++ b/dragonegg/test/validator/c++/2010-07-23-DeclLoc.cpp
@@ -1,7 +1,7 @@
 // RUN: %dragonegg -S -g %s -o - | FileCheck %s
 // Require the template function declaration refer to the correct filename.
 // First, locate the function decl in metadata, and pluck out the file handle:
-// CHECK: = metadata !{i32 {{[^,]*}}, metadata ![[filedata:[0-9]+]],{{.*extract_dwarf_data_from_header.*extract_dwarf_data_from_header.*extract_dwarf_data_from_header}}
+// CHECK: = metadata !{metadata !"0x2e\00extract_dwarf_data_from_header{{[^"]*}}", metadata ![[filedata:[0-9]+]],
 // Second: Require that filetag refers to metadata holding the correct filename:
 // CHECK: {{^!}}[[filedata]] = metadata !{metadata !"decl_should_be_here.hpp",
 typedef long unsigned int __darwin_size_t;