Revert "Fix crash on switch conditions of non-integer types in templates"

This reverts commit r368706. It broke ClangTidy tests.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@368738 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 70bd42cfa515aca324e4e5cd5677fa0dcde2c0ae..d2730d3e26d5601163d44474bd08bb9451be97b1 100644 (file)
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1669,15 +1669,6 @@ MemberExpr *MemberExpr::Create(
   MemberExpr *E = new (Mem) MemberExpr(Base, IsArrow, OperatorLoc, MemberDecl,
                                        NameInfo, T, VK, OK, NOUR);
 
-  if (FieldDecl *Field = dyn_cast<FieldDecl>(MemberDecl)) {
-    DeclContext *DC = MemberDecl->getDeclContext();
-    // dyn_cast_or_null is used to handle objC variables which do not
-    // have a declaration context.
-    CXXRecordDecl *RD = dyn_cast_or_null<CXXRecordDecl>(DC);
-    if (RD && RD->isDependentContext() && RD->isCurrentInstantiation(DC))
-      E->setTypeDependent(T->isDependentType());
-  }
-
   if (HasQualOrFound) {
     // FIXME: Wrong. We should be looking at the member declaration we found.
     if (QualifierLoc && QualifierLoc.getNestedNameSpecifier()->isDependent()) {

diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 9df559972868f7d551dc8a082e70db6b2c7f6499..3225dffe9220a493c212abd6b9e8b72cc029ac2a 100644 (file)
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -14288,8 +14288,6 @@ void Sema::RefersToMemberWithReducedAlignment(
   bool AnyIsPacked = false;
   do {
     QualType BaseType = ME->getBase()->getType();
-    if (BaseType->isDependentType())
-      return;
     if (ME->isArrow())
       BaseType = BaseType->getPointeeType();
     RecordDecl *RD = BaseType->getAs<RecordType>()->getDecl();

diff --git a/test/SemaTemplate/dependent-names.cpp b/test/SemaTemplate/dependent-names.cpp
index a8de159a1d46397d79c3a6b45a724c6395ff2318..67ef238083f04630c35dc435a6fcaa762e726d79 100644 (file)
--- a/test/SemaTemplate/dependent-names.cpp
+++ b/test/SemaTemplate/dependent-names.cpp
@@ -273,6 +273,9 @@ namespace PR10187 {
       }
       int e[10];
     };
+    void g() {
+      S<int>().f(); // expected-note {{here}}
+    }
   }
 
   namespace A2 {

diff --git a/test/SemaTemplate/enum-argument.cpp b/test/SemaTemplate/enum-argument.cpp
index a79ed8403e9f43b949c7b545c50a165a73effe77..7ff41961399017ff9d8dc87e4c197cc7ef6a2c1e 100644 (file)
--- a/test/SemaTemplate/enum-argument.cpp
+++ b/test/SemaTemplate/enum-argument.cpp
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
 
 enum Enum { val = 1 };
 template <Enum v> struct C {
@@ -30,7 +31,7 @@ namespace rdar8020920 {
     unsigned long long bitfield : e0;
 
     void f(int j) {
-      bitfield + j; // expected-warning {{expression result unused}}
+      bitfield + j;
     }
   };
 }

diff --git a/test/SemaTemplate/member-access-expr.cpp b/test/SemaTemplate/member-access-expr.cpp
index ef10d72a0ef80e3941b89af9f173b3f6bf75c0ef..8dba2e68d65628f1358767707848a77b86cbb486 100644 (file)
--- a/test/SemaTemplate/member-access-expr.cpp
+++ b/test/SemaTemplate/member-access-expr.cpp
@@ -156,7 +156,7 @@ namespace test6 {
     void get(B **ptr) {
       // It's okay if at some point we figure out how to diagnose this
       // at instantiation time.
-      *ptr = field; // expected-error {{assigning to 'test6::B *' from incompatible type 'test6::A *}}
+      *ptr = field;
     }
   };
 }

diff --git a/test/SemaTemplate/non-integral-switch-cond.cpp b/test/SemaTemplate/non-integral-switch-cond.cpp
deleted file mode 100644 (file)
index 23c8e0e..0000000
--- a/test/SemaTemplate/non-integral-switch-cond.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-
-struct NOT_AN_INTEGRAL_TYPE {};
-
-template <typename T>
-struct foo {
-  NOT_AN_INTEGRAL_TYPE Bad;
-  void run() {
-    switch (Bad) { // expected-error {{statement requires expression of integer type ('NOT_AN_INTEGRAL_TYPE' invalid)}}
-    case 0:
-      break;
-    }
-  }
-};