fixup! fix more tests

Author: Michael137

clang/test/CodeGen/block-with-perdefinedexpr.cpp

@@ -67,11 +67,11 @@ class Foo {
   }
   void inside_lambda() {
     auto lambda = []() {
-      // CHECK-DAG: @__PRETTY_FUNCTION__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke = private unnamed_addr constant [92 x i8] c"auto foonamespace::Foo::inside_lambda()::(anonymous class)::operator()() const_block_invoke\00", align 1
+      // CHECK-DAG: @__PRETTY_FUNCTION__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke = private unnamed_addr constant [83 x i8] c"auto foonamespace::Foo::inside_lambda()::(lambda)::operator()() const_block_invoke\00", align 1
       const char * (^block1)() = ^() {
         return __PRETTY_FUNCTION__;
       };
-      // CHECK-DAG: 	  @__PRETTY_FUNCTION__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke_2 = private unnamed_addr constant [94 x i8] c"auto foonamespace::Foo::inside_lambda()::(anonymous class)::operator()() const_block_invoke_2\00", align 1
+      // CHECK-DAG: 	  @__PRETTY_FUNCTION__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke_2 = private unnamed_addr constant [85 x i8] c"auto foonamespace::Foo::inside_lambda()::(lambda)::operator()() const_block_invoke_2\00", align 1
       const char * (^block2)() = ^() {
         return __PRETTY_FUNCTION__;
       };

clang/test/CodeGenCXX/predefined-expr.cpp

@@ -10,7 +10,7 @@
 // CHECK-DAG: private unnamed_addr constant [103 x i8] c"static void ClassWithTemplateTemplateParam<char>::staticMember() [T = char, Param = NS::ClassTemplate]\00"
 // CHECK-DAG: private unnamed_addr constant [106 x i8] c"void OuterClass<int *>::MiddleClass::InnerClass<float>::memberFunction(T, U) const [T = int *, U = float]\00"
 // CHECK-DAG: private unnamed_addr constant [51 x i8] c"void functionTemplateWithCapturedStmt(T) [T = int]\00"
-// CHECK-DAG: private unnamed_addr constant [76 x i8] c"auto functionTemplateWithLambda(int)::(lambda)::operator()() const\00"
+// CHECK-DAG: private unnamed_addr constant [67 x i8] c"auto functionTemplateWithLambda(int)::(lambda)::operator()() const\00"
 // CHECK-DAG: private unnamed_addr constant [65 x i8] c"void functionTemplateWithUnnamedTemplateParameter(T) [T = float]\00"
 
 // CHECK-DAG: private unnamed_addr constant [60 x i8] c"void functionTemplateExplicitSpecialization(T) [T = double]\00"
@@ -28,13 +28,13 @@
 // CHECK-DAG: private unnamed_addr constant [46 x i8] c"void NS::Base::functionTemplate1(T) [T = int]\00"
 
 // CHECK-DAG: private unnamed_addr constant [23 x i8] c"anonymousUnionFunction\00"
-// CHECK-DAG: private unnamed_addr constant [83 x i8] c"void NS::ContainerForAnonymousRecords::(anonymous union)::anonymousUnionFunction()\00"
+// CHECK-DAG: private unnamed_addr constant [81 x i8] c"void NS::ContainerForAnonymousRecords::(unnamed union)::anonymousUnionFunction()\00"
 
 // CHECK-DAG: private unnamed_addr constant [24 x i8] c"anonymousStructFunction\00"
-// CHECK-DAG: private unnamed_addr constant [85 x i8] c"void NS::ContainerForAnonymousRecords::(anonymous struct)::anonymousStructFunction()\00"
+// CHECK-DAG: private unnamed_addr constant [83 x i8] c"void NS::ContainerForAnonymousRecords::(unnamed struct)::anonymousStructFunction()\00"
 
 // CHECK-DAG: private unnamed_addr constant [23 x i8] c"anonymousClassFunction\00"
-// CHECK-DAG: private unnamed_addr constant [83 x i8] c"void NS::ContainerForAnonymousRecords::(anonymous class)::anonymousClassFunction()\00"
+// CHECK-DAG: private unnamed_addr constant [81 x i8] c"void NS::ContainerForAnonymousRecords::(unnamed class)::anonymousClassFunction()\00"
 
 // CHECK-DAG: private unnamed_addr constant [12 x i8] c"~Destructor\00"
 // CHECK-DAG: private unnamed_addr constant [30 x i8] c"NS::Destructor::~Destructor()\00"

clang/test/SemaCXX/predefined-expr.cpp

@@ -26,8 +26,8 @@ int baz() {
   []() {
     static_assert(sizeof(__func__) == 11, "operator()");
     static_assert(sizeof(__FUNCTION__) == 11, "operator()");
-    static_assert(sizeof(__PRETTY_FUNCTION__) == 50,
-                  "auto baz()::<anonymous class>::operator()() const");
+    static_assert(sizeof(__PRETTY_FUNCTION__) == 41,
+                  "auto baz()::<lambda>::operator()() const");
     return 0;
   }
   ();
@@ -56,8 +56,8 @@ int main() {
   []() {
     static_assert(sizeof(__func__) == 11, "operator()");
     static_assert(sizeof(__FUNCTION__) == 11, "operator()");
-    static_assert(sizeof(__PRETTY_FUNCTION__) == 51,
-                  "auto main()::<anonymous class>::operator()() const");
+    static_assert(sizeof(__PRETTY_FUNCTION__) == 42,
+                  "auto main()::<lambda>::operator()() const");
     return 0;
   }
   ();
@@ -87,8 +87,8 @@ int main() {
     {
       static_assert(sizeof(__func__) == 11, "operator()");
       static_assert(sizeof(__FUNCTION__) == 11, "operator()");
-      static_assert(sizeof(__PRETTY_FUNCTION__) == 51,
-                    "auto main()::<anonymous class>::operator()() const");
+      static_assert(sizeof(__PRETTY_FUNCTION__) == 42,
+                    "auto main()::<lambda>::operator()() const");
     }
   }
   ();