4 files changed, 1 insertions, 42 deletions
diff --git a/clang/test/CodeGen/debug-info-line5.cpp b/clang/test/CodeGen/debug-info-line5.cpp
deleted file mode 100644
index 0f1042738f4..00000000000
--- a/clang/test/CodeGen/debug-info-line5.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %clang %s -g -gcolumn-info -S -emit-llvm -o - | FileCheck %s
-// Line table entries should reference this cpp file, not the header
-
-#include "debug-info-line5.h"
-
-int result;
-int foo(unsigned);
-
-int main()
-{
-  while ( 1 )
-  {
-    result = foo(Marker);
-  }
-  return result;
-}
-
-// CHECK: !{{[0-9]*}} = metadata !{i32 {{[0-9]*}}, i32 {{[0-9]*}}, null, metadata !"Marker", {{.*}} ; [ DW_TAG_variable ] [Marker]
diff --git a/clang/test/CodeGen/debug-info-line5.h b/clang/test/CodeGen/debug-info-line5.h
deleted file mode 100644
index 690c9b76508..00000000000
--- a/clang/test/CodeGen/debug-info-line5.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Declaration of "Marker"
-const unsigned Marker = 0xFF999999;
diff --git a/clang/test/CodeGen/debug-info-scope.c b/clang/test/CodeGen/debug-info-scope.c
index 05cd299ff36..9decaeafd50 100644
--- a/clang/test/CodeGen/debug-info-scope.c
+++ b/clang/test/CodeGen/debug-info-scope.c
@@ -1,16 +1,7 @@
 // RUN: %clang_cc1 -g -emit-llvm < %s | FileCheck %s
-
-// Make sure that the debug info of the local variable d does not shadow
-// the global variable d
-// CHECK: [ DW_TAG_variable ] [d] [line 6] [def]
-const int d = 100;
-
 // Two variables with same name in separate scope.
 // Radar 8330217.
 int main() {
-// CHECK-NOT: [ DW_TAG_variable ] [d] [line 13]
-// CHECK: [ DW_TAG_auto_variable ] [d] [line 13]
-	const int d = 4;
 	int j = 0;
 	int k = 0;
 // CHECK: DW_TAG_auto_variable ] [i]
@@ -21,5 +12,5 @@ int main() {
 // CHECK-NEXT: DW_TAG_lexical_block
 	for (int i = 0; i < 10; i++)
 		k++;
-	return d; // make a reference to d so that its debug info gets included
+	return 0;
 }
diff --git a/clang/test/CodeGenCXX/debug-info-namespace.cpp b/clang/test/CodeGenCXX/debug-info-namespace.cpp
index 17352e88182..ec7e69a0cc7 100644
--- a/clang/test/CodeGenCXX/debug-info-namespace.cpp
+++ b/clang/test/CodeGenCXX/debug-info-namespace.cpp
@@ -39,16 +39,6 @@ int func(bool b) {
 // This should work even if 'i' and 'func' were declarations & not definitions,
 // but it doesn't yet.
 
-namespace C
-{
- const int j = 32;
-}
-
-int func2()
-{
- return C::j;
-} 
-
 // CHECK: [[CU:![0-9]*]] = {{.*}}[[MODULES:![0-9]*]], metadata !""} ; [ DW_TAG_compile_unit ]
 // CHECK: [[FILE:![0-9]*]] {{.*}}debug-info-namespace.cpp"
 // CHECK: [[FOO:![0-9]*]] {{.*}} ; [ DW_TAG_structure_type ] [foo] [line 5, size 0, align 0, offset 0] [decl] [from ]
@@ -60,8 +50,6 @@ int func2()
 // CHECK: [[FUNC:![0-9]*]] {{.*}} ; [ DW_TAG_subprogram ] {{.*}} [def] [func]
 // CHECK: [[FILE2]]} ; [ DW_TAG_file_type ] [{{.*}}foo.cpp]
 // CHECK: [[I:![0-9]*]] = {{.*}}, metadata [[NS]], metadata !"i", {{.*}} ; [ DW_TAG_variable ] [i]
-// CHECK: [[VAR:![0-9]*]] = {{.*}}, metadata [[SPACE:![0-9]*]], metadata !"j", {{.*}} ; [ DW_TAG_variable ] [j]
-// CHECK: [[SPACE]] = {{.*}}, metadata !"C", {{.*}} ; [ DW_TAG_namespace ] [C]
 // CHECK: [[MODULES]] = metadata !{metadata [[M1:![0-9]*]], metadata [[M2:![0-9]*]], metadata [[M3:![0-9]*]], metadata [[M4:![0-9]*]], metadata [[M5:![0-9]*]], metadata [[M6:![0-9]*]], metadata [[M7:![0-9]*]], metadata [[M8:![0-9]*]], metadata [[M9:![0-9]*]], metadata [[M10:![0-9]*]], metadata [[M11:![0-9]*]], metadata [[M12:![0-9]*]]}
 // CHECK: [[M1]] = metadata !{i32 {{[0-9]*}}, metadata [[CTXT]], metadata [[NS]], i32 11} ; [ DW_TAG_imported_module ]
 // CHECK: [[M2]] = metadata !{i32 {{[0-9]*}}, metadata [[CU]], metadata [[CTXT]], i32 {{[0-9]*}}} ; [ DW_TAG_imported_module ]