[PATCH] [clang] Fix bug 48848 by removing assertion related to recoverFromMSUnqualifiedLookup

[mibintc]

Summary

Fix https://bugs.llvm.org/show_bug.cgi?id=48848 by removing assertion

[rnk]

@erik.pilkington , you added this assert in http://github.com/llvm/llvm-project/commit/3cdc317342d8c2b36de2839ea6ebefec17cb271e, are you OK with this? I'm OK with the change.

[rnk]

In the absence of a response, let's land this.

[erik.pilkington]

Sorry, yeah, I'm OK with this change.

clang/test/SemaCXX/lambda-expressions.cpp

671

I think it makes more sense for this test to be in its own file since entire rest of the test is #ifndefed out.

clang/lib/Sema/SemaExprCXX.cpp

QualType Sema::getCurrentThisType() {
   QualType ThisTy = CXXThisTypeOverride;
 
   if (CXXMethodDecl *method = dyn_cast<CXXMethodDecl>(DC)) {
     if (method && method->isInstance())
       ThisTy = method->getThisType();
   }
 
   if (ThisTy.isNull() && isLambdaCallOperator(CurContext) &&
-      inTemplateInstantiation()) {
-
-    assert(isa<CXXRecordDecl>(DC) &&
-           "Trying to get 'this' type from static method?");
+      inTemplateInstantiation() && isa<CXXRecordDecl>(DC)) {
 
     // This is a lambda call operator that is being instantiated as a default
     // initializer. DC must point to the enclosing class type, so we can recover
     // the 'this' type from it.
-
     QualType ClassTy = Context.getTypeDeclType(cast<CXXRecordDecl>(DC));
     // There are no cv-qualifiers for 'this' within default initializers,
     // per [expr.prim.general]p4.
     ThisTy = Context.getPointerType(ClassTy);
   }
 
   // If we are within a lambda's call operator, the cv-qualifiers of 'this'
   // might need to be adjusted if the lambda or any of its enclosing lambda's

clang/test/SemaCXX/lambda-expressions.cpp

 // RUN: %clang_cc1 -std=c++14 -Wno-unused-value -fsyntax-only -verify -verify=expected-cxx14 -fblocks %s
 // RUN: %clang_cc1 -std=c++17 -Wno-unused-value -fsyntax-only -verify -fblocks %s
+// RUN: %clang_cc1 -std=c++17 -fblocks -DSHOW_MS -Wno-unused-value -fms-compatibility -fdelayed-template-parsing -fsyntax-only -verify %s
 
+#ifndef SHOW_MS
 namespace std { class type_info; };
 
 namespace ExplicitCapture {
   class C {
     int Member;
 
     static void Overload(int);
     void Overload();
void Test() {
   union {           // expected-note {{'' declared here}}
     int i;
   };
   [] { return i; }; // expected-error {{variable '' cannot be implicitly captured in a lambda with no capture-default specified}}
                     // expected-note@-1 {{lambda expression begins here}}
 
 }
 };
+
+#else
+template <typename RT, typename ET>
+void Decider(const RT &sp, ET &ep) {
+  [=](auto i) { ep[i] = sp[i + j]; };
+    // expected-error@-1 {{use of undeclared identifier 'j'}}
+}
+
+template <typename EMT> void LS() {
+  int *ep;
+  Decider(5, ep);
+}
+
+void runChapter4()
+{
+  LS<int>(); // expected-note {{in instantiation of}}
+}
+
+#endif