Fix r361893 to also update a recently-added test.

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

diff --git a/test/AST/ast-dump-expr-json.cpp b/test/AST/ast-dump-expr-json.cpp
index fa6d6ed38157555c7755008a3bcf4be3bea44bb1..90a3bb073422119c4b6d5ba92eec5857a140f757 100644 (file)
--- a/test/AST/ast-dump-expr-json.cpp
+++ b/test/AST/ast-dump-expr-json.cpp
@@ -3854,31 +3854,6 @@ void TestNonADLCall3() {
 // CHECK-NEXT:                  "inner": [
 // CHECK-NEXT:                   {
 // CHECK-NEXT:                    "id": "0x{{.*}}",
-// CHECK-NEXT:                    "kind": "FieldDecl",
-// CHECK-NEXT:                    "loc": {
-// CHECK-NEXT:                     "col": 8,
-// CHECK-NEXT:                     "file": "{{.*}}",
-// CHECK-NEXT:                     "line": 98
-// CHECK-NEXT:                    },
-// CHECK-NEXT:                    "range": {
-// CHECK-NEXT:                     "begin": {
-// CHECK-NEXT:                      "col": 8,
-// CHECK-NEXT:                      "file": "{{.*}}",
-// CHECK-NEXT:                      "line": 98
-// CHECK-NEXT:                     },
-// CHECK-NEXT:                     "end": {
-// CHECK-NEXT:                      "col": 8,
-// CHECK-NEXT:                      "file": "{{.*}}",
-// CHECK-NEXT:                      "line": 98
-// CHECK-NEXT:                     }
-// CHECK-NEXT:                    },
-// CHECK-NEXT:                    "isImplicit": true,
-// CHECK-NEXT:                    "type": {
-// CHECK-NEXT:                     "qualType": "V *"
-// CHECK-NEXT:                    }
-// CHECK-NEXT:                   },
-// CHECK-NEXT:                   {
-// CHECK-NEXT:                    "id": "0x{{.*}}",
 // CHECK-NEXT:                    "kind": "CXXMethodDecl",
 // CHECK-NEXT:                    "loc": {
 // CHECK-NEXT:                     "col": 7,
@@ -3920,6 +3895,31 @@ void TestNonADLCall3() {
 // CHECK-NEXT:                      }
 // CHECK-NEXT:                     }
 // CHECK-NEXT:                    ]
+// CHECK-NEXT:                   },
+// CHECK-NEXT:                   {
+// CHECK-NEXT:                    "id": "0x{{.*}}",
+// CHECK-NEXT:                    "kind": "FieldDecl",
+// CHECK-NEXT:                    "loc": {
+// CHECK-NEXT:                     "col": 8,
+// CHECK-NEXT:                     "file": "{{.*}}",
+// CHECK-NEXT:                     "line": 98
+// CHECK-NEXT:                    },
+// CHECK-NEXT:                    "range": {
+// CHECK-NEXT:                     "begin": {
+// CHECK-NEXT:                      "col": 8,
+// CHECK-NEXT:                      "file": "{{.*}}",
+// CHECK-NEXT:                      "line": 98
+// CHECK-NEXT:                     },
+// CHECK-NEXT:                     "end": {
+// CHECK-NEXT:                      "col": 8,
+// CHECK-NEXT:                      "file": "{{.*}}",
+// CHECK-NEXT:                      "line": 98
+// CHECK-NEXT:                     }
+// CHECK-NEXT:                    },
+// CHECK-NEXT:                    "isImplicit": true,
+// CHECK-NEXT:                    "type": {
+// CHECK-NEXT:                     "qualType": "V *"
+// CHECK-NEXT:                    }
 // CHECK-NEXT:                   }
 // CHECK-NEXT:                  ]
 // CHECK-NEXT:                 },
@@ -4043,31 +4043,6 @@ void TestNonADLCall3() {
 // CHECK-NEXT:                  "inner": [
 // CHECK-NEXT:                   {
 // CHECK-NEXT:                    "id": "0x{{.*}}",
-// CHECK-NEXT:                    "kind": "FieldDecl",
-// CHECK-NEXT:                    "loc": {
-// CHECK-NEXT:                     "col": 8,
-// CHECK-NEXT:                     "file": "{{.*}}",
-// CHECK-NEXT:                     "line": 99
-// CHECK-NEXT:                    },
-// CHECK-NEXT:                    "range": {
-// CHECK-NEXT:                     "begin": {
-// CHECK-NEXT:                      "col": 8,
-// CHECK-NEXT:                      "file": "{{.*}}",
-// CHECK-NEXT:                      "line": 99
-// CHECK-NEXT:                     },
-// CHECK-NEXT:                     "end": {
-// CHECK-NEXT:                      "col": 8,
-// CHECK-NEXT:                      "file": "{{.*}}",
-// CHECK-NEXT:                      "line": 99
-// CHECK-NEXT:                     }
-// CHECK-NEXT:                    },
-// CHECK-NEXT:                    "isImplicit": true,
-// CHECK-NEXT:                    "type": {
-// CHECK-NEXT:                     "qualType": "V"
-// CHECK-NEXT:                    }
-// CHECK-NEXT:                   },
-// CHECK-NEXT:                   {
-// CHECK-NEXT:                    "id": "0x{{.*}}",
 // CHECK-NEXT:                    "kind": "CXXMethodDecl",
 // CHECK-NEXT:                    "loc": {
 // CHECK-NEXT:                     "col": 7,
@@ -4109,6 +4084,31 @@ void TestNonADLCall3() {
 // CHECK-NEXT:                      }
 // CHECK-NEXT:                     }
 // CHECK-NEXT:                    ]
+// CHECK-NEXT:                   },
+// CHECK-NEXT:                   {
+// CHECK-NEXT:                    "id": "0x{{.*}}",
+// CHECK-NEXT:                    "kind": "FieldDecl",
+// CHECK-NEXT:                    "loc": {
+// CHECK-NEXT:                     "col": 8,
+// CHECK-NEXT:                     "file": "{{.*}}",
+// CHECK-NEXT:                     "line": 99
+// CHECK-NEXT:                    },
+// CHECK-NEXT:                    "range": {
+// CHECK-NEXT:                     "begin": {
+// CHECK-NEXT:                      "col": 8,
+// CHECK-NEXT:                      "file": "{{.*}}",
+// CHECK-NEXT:                      "line": 99
+// CHECK-NEXT:                     },
+// CHECK-NEXT:                     "end": {
+// CHECK-NEXT:                      "col": 8,
+// CHECK-NEXT:                      "file": "{{.*}}",
+// CHECK-NEXT:                      "line": 99
+// CHECK-NEXT:                     }
+// CHECK-NEXT:                    },
+// CHECK-NEXT:                    "isImplicit": true,
+// CHECK-NEXT:                    "type": {
+// CHECK-NEXT:                     "qualType": "V"
+// CHECK-NEXT:                    }
 // CHECK-NEXT:                   }
 // CHECK-NEXT:                  ]
 // CHECK-NEXT:                 },
@@ -4811,31 +4811,6 @@ void TestNonADLCall3() {
 // CHECK-NEXT:          "inner": [
 // CHECK-NEXT:           {
 // CHECK-NEXT:            "id": "0x{{.*}}",
-// CHECK-NEXT:            "kind": "FieldDecl",
-// CHECK-NEXT:            "loc": {
-// CHECK-NEXT:             "col": 4,
-// CHECK-NEXT:             "file": "{{.*}}",
-// CHECK-NEXT:             "line": 107
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "range": {
-// CHECK-NEXT:             "begin": {
-// CHECK-NEXT:              "col": 4,
-// CHECK-NEXT:              "file": "{{.*}}",
-// CHECK-NEXT:              "line": 107
-// CHECK-NEXT:             },
-// CHECK-NEXT:             "end": {
-// CHECK-NEXT:              "col": 4,
-// CHECK-NEXT:              "file": "{{.*}}",
-// CHECK-NEXT:              "line": 107
-// CHECK-NEXT:             }
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "isImplicit": true,
-// CHECK-NEXT:            "type": {
-// CHECK-NEXT:             "qualType": "Ts..."
-// CHECK-NEXT:            }
-// CHECK-NEXT:           },
-// CHECK-NEXT:           {
-// CHECK-NEXT:            "id": "0x{{.*}}",
 // CHECK-NEXT:            "kind": "CXXMethodDecl",
 // CHECK-NEXT:            "loc": {
 // CHECK-NEXT:             "col": 3,
@@ -4877,6 +4852,31 @@ void TestNonADLCall3() {
 // CHECK-NEXT:              }
 // CHECK-NEXT:             }
 // CHECK-NEXT:            ]
+// CHECK-NEXT:           },
+// CHECK-NEXT:           {
+// CHECK-NEXT:            "id": "0x{{.*}}",
+// CHECK-NEXT:            "kind": "FieldDecl",
+// CHECK-NEXT:            "loc": {
+// CHECK-NEXT:             "col": 4,
+// CHECK-NEXT:             "file": "{{.*}}",
+// CHECK-NEXT:             "line": 107
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "range": {
+// CHECK-NEXT:             "begin": {
+// CHECK-NEXT:              "col": 4,
+// CHECK-NEXT:              "file": "{{.*}}",
+// CHECK-NEXT:              "line": 107
+// CHECK-NEXT:             },
+// CHECK-NEXT:             "end": {
+// CHECK-NEXT:              "col": 4,
+// CHECK-NEXT:              "file": "{{.*}}",
+// CHECK-NEXT:              "line": 107
+// CHECK-NEXT:             }
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "isImplicit": true,
+// CHECK-NEXT:            "type": {
+// CHECK-NEXT:             "qualType": "Ts..."
+// CHECK-NEXT:            }
 // CHECK-NEXT:           }
 // CHECK-NEXT:          ]
 // CHECK-NEXT:         },
@@ -5799,56 +5799,6 @@ void TestNonADLCall3() {
 // CHECK-NEXT:          "inner": [
 // CHECK-NEXT:           {
 // CHECK-NEXT:            "id": "0x{{.*}}",
-// CHECK-NEXT:            "kind": "FieldDecl",
-// CHECK-NEXT:            "loc": {
-// CHECK-NEXT:             "col": 4,
-// CHECK-NEXT:             "file": "{{.*}}",
-// CHECK-NEXT:             "line": 112
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "range": {
-// CHECK-NEXT:             "begin": {
-// CHECK-NEXT:              "col": 4,
-// CHECK-NEXT:              "file": "{{.*}}",
-// CHECK-NEXT:              "line": 112
-// CHECK-NEXT:             },
-// CHECK-NEXT:             "end": {
-// CHECK-NEXT:              "col": 4,
-// CHECK-NEXT:              "file": "{{.*}}",
-// CHECK-NEXT:              "line": 112
-// CHECK-NEXT:             }
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "isImplicit": true,
-// CHECK-NEXT:            "type": {
-// CHECK-NEXT:             "qualType": "int"
-// CHECK-NEXT:            }
-// CHECK-NEXT:           },
-// CHECK-NEXT:           {
-// CHECK-NEXT:            "id": "0x{{.*}}",
-// CHECK-NEXT:            "kind": "FieldDecl",
-// CHECK-NEXT:            "loc": {
-// CHECK-NEXT:             "col": 8,
-// CHECK-NEXT:             "file": "{{.*}}",
-// CHECK-NEXT:             "line": 112
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "range": {
-// CHECK-NEXT:             "begin": {
-// CHECK-NEXT:              "col": 8,
-// CHECK-NEXT:              "file": "{{.*}}",
-// CHECK-NEXT:              "line": 112
-// CHECK-NEXT:             },
-// CHECK-NEXT:             "end": {
-// CHECK-NEXT:              "col": 8,
-// CHECK-NEXT:              "file": "{{.*}}",
-// CHECK-NEXT:              "line": 112
-// CHECK-NEXT:             }
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "isImplicit": true,
-// CHECK-NEXT:            "type": {
-// CHECK-NEXT:             "qualType": "int &"
-// CHECK-NEXT:            }
-// CHECK-NEXT:           },
-// CHECK-NEXT:           {
-// CHECK-NEXT:            "id": "0x{{.*}}",
 // CHECK-NEXT:            "kind": "CXXMethodDecl",
 // CHECK-NEXT:            "loc": {
 // CHECK-NEXT:             "col": 3,
@@ -6035,6 +5985,56 @@ void TestNonADLCall3() {
 // CHECK-NEXT:              ]
 // CHECK-NEXT:             }
 // CHECK-NEXT:            ]
+// CHECK-NEXT:           },
+// CHECK-NEXT:           {
+// CHECK-NEXT:            "id": "0x{{.*}}",
+// CHECK-NEXT:            "kind": "FieldDecl",
+// CHECK-NEXT:            "loc": {
+// CHECK-NEXT:             "col": 4,
+// CHECK-NEXT:             "file": "{{.*}}",
+// CHECK-NEXT:             "line": 112
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "range": {
+// CHECK-NEXT:             "begin": {
+// CHECK-NEXT:              "col": 4,
+// CHECK-NEXT:              "file": "{{.*}}",
+// CHECK-NEXT:              "line": 112
+// CHECK-NEXT:             },
+// CHECK-NEXT:             "end": {
+// CHECK-NEXT:              "col": 4,
+// CHECK-NEXT:              "file": "{{.*}}",
+// CHECK-NEXT:              "line": 112
+// CHECK-NEXT:             }
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "isImplicit": true,
+// CHECK-NEXT:            "type": {
+// CHECK-NEXT:             "qualType": "int"
+// CHECK-NEXT:            }
+// CHECK-NEXT:           },
+// CHECK-NEXT:           {
+// CHECK-NEXT:            "id": "0x{{.*}}",
+// CHECK-NEXT:            "kind": "FieldDecl",
+// CHECK-NEXT:            "loc": {
+// CHECK-NEXT:             "col": 8,
+// CHECK-NEXT:             "file": "{{.*}}",
+// CHECK-NEXT:             "line": 112
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "range": {
+// CHECK-NEXT:             "begin": {
+// CHECK-NEXT:              "col": 8,
+// CHECK-NEXT:              "file": "{{.*}}",
+// CHECK-NEXT:              "line": 112
+// CHECK-NEXT:             },
+// CHECK-NEXT:             "end": {
+// CHECK-NEXT:              "col": 8,
+// CHECK-NEXT:              "file": "{{.*}}",
+// CHECK-NEXT:              "line": 112
+// CHECK-NEXT:             }
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "isImplicit": true,
+// CHECK-NEXT:            "type": {
+// CHECK-NEXT:             "qualType": "int &"
+// CHECK-NEXT:            }
 // CHECK-NEXT:           }
 // CHECK-NEXT:          ]
 // CHECK-NEXT:         },
@@ -6359,98 +6359,98 @@ void TestNonADLCall3() {
 // CHECK-NEXT:          "inner": [
 // CHECK-NEXT:           {
 // CHECK-NEXT:            "id": "0x{{.*}}",
-// CHECK-NEXT:            "kind": "FieldDecl",
+// CHECK-NEXT:            "kind": "CXXMethodDecl",
 // CHECK-NEXT:            "loc": {
-// CHECK-NEXT:             "col": 4,
+// CHECK-NEXT:             "col": 3,
 // CHECK-NEXT:             "file": "{{.*}}",
 // CHECK-NEXT:             "line": 113
 // CHECK-NEXT:            },
 // CHECK-NEXT:            "range": {
 // CHECK-NEXT:             "begin": {
-// CHECK-NEXT:              "col": 4,
+// CHECK-NEXT:              "col": 16,
 // CHECK-NEXT:              "file": "{{.*}}",
 // CHECK-NEXT:              "line": 113
 // CHECK-NEXT:             },
 // CHECK-NEXT:             "end": {
-// CHECK-NEXT:              "col": 4,
+// CHECK-NEXT:              "col": 18,
 // CHECK-NEXT:              "file": "{{.*}}",
 // CHECK-NEXT:              "line": 113
 // CHECK-NEXT:             }
 // CHECK-NEXT:            },
-// CHECK-NEXT:            "isImplicit": true,
+// CHECK-NEXT:            "name": "operator()",
 // CHECK-NEXT:            "type": {
-// CHECK-NEXT:             "qualType": "Ts..."
-// CHECK-NEXT:            }
+// CHECK-NEXT:             "qualType": "auto () const -> auto"
+// CHECK-NEXT:            },
+// CHECK-NEXT:            "inline": true,
+// CHECK-NEXT:            "inner": [
+// CHECK-NEXT:             {
+// CHECK-NEXT:              "id": "0x{{.*}}",
+// CHECK-NEXT:              "kind": "CompoundStmt",
+// CHECK-NEXT:              "range": {
+// CHECK-NEXT:               "begin": {
+// CHECK-NEXT:                "col": 17,
+// CHECK-NEXT:                "file": "{{.*}}",
+// CHECK-NEXT:                "line": 113
+// CHECK-NEXT:               },
+// CHECK-NEXT:               "end": {
+// CHECK-NEXT:                "col": 18,
+// CHECK-NEXT:                "file": "{{.*}}",
+// CHECK-NEXT:                "line": 113
+// CHECK-NEXT:               }
+// CHECK-NEXT:              }
+// CHECK-NEXT:             }
+// CHECK-NEXT:            ]
 // CHECK-NEXT:           },
 // CHECK-NEXT:           {
 // CHECK-NEXT:            "id": "0x{{.*}}",
 // CHECK-NEXT:            "kind": "FieldDecl",
 // CHECK-NEXT:            "loc": {
-// CHECK-NEXT:             "col": 10,
+// CHECK-NEXT:             "col": 4,
 // CHECK-NEXT:             "file": "{{.*}}",
 // CHECK-NEXT:             "line": 113
 // CHECK-NEXT:            },
 // CHECK-NEXT:            "range": {
 // CHECK-NEXT:             "begin": {
-// CHECK-NEXT:              "col": 10,
+// CHECK-NEXT:              "col": 4,
 // CHECK-NEXT:              "file": "{{.*}}",
 // CHECK-NEXT:              "line": 113
 // CHECK-NEXT:             },
 // CHECK-NEXT:             "end": {
-// CHECK-NEXT:              "col": 10,
+// CHECK-NEXT:              "col": 4,
 // CHECK-NEXT:              "file": "{{.*}}",
 // CHECK-NEXT:              "line": 113
 // CHECK-NEXT:             }
 // CHECK-NEXT:            },
 // CHECK-NEXT:            "isImplicit": true,
 // CHECK-NEXT:            "type": {
-// CHECK-NEXT:             "desugaredQualType": "int",
-// CHECK-NEXT:             "qualType": "int"
+// CHECK-NEXT:             "qualType": "Ts..."
 // CHECK-NEXT:            }
 // CHECK-NEXT:           },
 // CHECK-NEXT:           {
 // CHECK-NEXT:            "id": "0x{{.*}}",
-// CHECK-NEXT:            "kind": "CXXMethodDecl",
+// CHECK-NEXT:            "kind": "FieldDecl",
 // CHECK-NEXT:            "loc": {
-// CHECK-NEXT:             "col": 3,
+// CHECK-NEXT:             "col": 10,
 // CHECK-NEXT:             "file": "{{.*}}",
 // CHECK-NEXT:             "line": 113
 // CHECK-NEXT:            },
 // CHECK-NEXT:            "range": {
 // CHECK-NEXT:             "begin": {
-// CHECK-NEXT:              "col": 16,
+// CHECK-NEXT:              "col": 10,
 // CHECK-NEXT:              "file": "{{.*}}",
 // CHECK-NEXT:              "line": 113
 // CHECK-NEXT:             },
 // CHECK-NEXT:             "end": {
-// CHECK-NEXT:              "col": 18,
+// CHECK-NEXT:              "col": 10,
 // CHECK-NEXT:              "file": "{{.*}}",
 // CHECK-NEXT:              "line": 113
 // CHECK-NEXT:             }
 // CHECK-NEXT:            },
-// CHECK-NEXT:            "name": "operator()",
+// CHECK-NEXT:            "isImplicit": true,
 // CHECK-NEXT:            "type": {
-// CHECK-NEXT:             "qualType": "auto () const -> auto"
-// CHECK-NEXT:            },
-// CHECK-NEXT:            "inline": true,
-// CHECK-NEXT:            "inner": [
-// CHECK-NEXT:             {
-// CHECK-NEXT:              "id": "0x{{.*}}",
-// CHECK-NEXT:              "kind": "CompoundStmt",
-// CHECK-NEXT:              "range": {
-// CHECK-NEXT:               "begin": {
-// CHECK-NEXT:                "col": 17,
-// CHECK-NEXT:                "file": "{{.*}}",
-// CHECK-NEXT:                "line": 113
-// CHECK-NEXT:               },
-// CHECK-NEXT:               "end": {
-// CHECK-NEXT:                "col": 18,
-// CHECK-NEXT:                "file": "{{.*}}",
-// CHECK-NEXT:                "line": 113
-// CHECK-NEXT:               }
-// CHECK-NEXT:              }
-// CHECK-NEXT:             }
-// CHECK-NEXT:            ]
+// CHECK-NEXT:             "desugaredQualType": "int",
+// CHECK-NEXT:             "qualType": "int"
+// CHECK-NEXT:            }
 // CHECK-NEXT:           }
 // CHECK-NEXT:          ]
 // CHECK-NEXT:         },