Revert "Fix the undefined-but-used odr-use marker (DR48)"

Wrong patch got committed (this one isn't ready for prime time).

This reverts commit r209996.

llvm-svn: 209997

1 files changed, 7 insertions, 4 deletions

diff --git a/clang/test/SemaCXX/undefined-internal.cpp b/clang/test/SemaCXX/undefined-internal.cpp
index 7f81ac9feba..1cb0708a532 100644
--- a/clang/test/SemaCXX/undefined-internal.cpp
+++ b/clang/test/SemaCXX/undefined-internal.cpp
@@ -137,12 +137,15 @@ namespace cxx11_odr_rules {
   //
   // Note that the warning in question can trigger in cases some people would
   // consider false positives; hopefully that happens rarely in practice.
+  //
+  // FIXME: Suppressing this test while I figure out how to fix a bug in the
+  // odr-use marking code.
 
   namespace {
     struct A {
       static const int unused = 10;
-      static const int used1 = 20; // expected-warning {{internal linkage}}
-      static const int used2 = 20; // expected-warning {{internal linkage}}
+      static const int used1 = 20; // xpected-warning {{internal linkage}}
+      static const int used2 = 20; // xpected-warning {{internal linkage}}
       virtual ~A() {}
     };
   }
@@ -163,10 +166,10 @@ namespace cxx11_odr_rules {
 
     // Check that the checks work with unevaluated contexts
     (void)sizeof(p(A::used1));
-    (void)typeid(p(A::used1)); // expected-note {{used here}}
+    (void)typeid(p(A::used1)); // xpected-note {{used here}}
 
     // Misc other testing
-    a(A::unused, 1 ? A::used2 : A::used2); // expected-note {{used here}}
+    a(A::unused, 1 ? A::used2 : A::used2); // xpected-note {{used here}}
     b();
   }
 }