--b1_5ecbcf65bbc234960a3f439bd101ee5d
Content-Type: text/plain; charset = "utf-8"
Content-Transfer-Encoding: quoted-printable

nwilson created this revision.
nwilson added reviewers: rsmith, hubert.reinterpretcast, fraggamuffin, fais=
alv, aaron.ballman.
nwilson added a subscriber: cfe-commits.

- Store the exception specification range's begin and end SourceLocation in=
 DeclaratorChuck::FunctionTypeInfo. These SourceLocations can be used in a =
FixItHint Range.
- Add diagnostic; function concept having an exception specification.


http://reviews.llvm.org/D11789

Files:
  include/clang/Basic/DiagnosticSemaKinds.td
  include/clang/Sema/DeclSpec.h
  lib/Parse/ParseDecl.cpp
  lib/Parse/ParseExpr.cpp
  lib/Parse/ParseExprCXX.cpp
  lib/Sema/DeclSpec.cpp
  lib/Sema/SemaDecl.cpp
  lib/Sema/SemaType.cpp
  test/SemaCXX/cxx-concept-declaration.cpp


--b1_5ecbcf65bbc234960a3f439bd101ee5d
Content-Type: text/x-patch; charset=utf-8; name="D11789.31414.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="D11789.31414.patch"

SW5kZXg6IHRlc3QvU2VtYUNYWC9jeHgtY29uY2VwdC1kZWNsYXJhdGlvbi5j
cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGVzdC9TZW1hQ1hYL2N4
eC1jb25jZXB0LWRlY2xhcmF0aW9uLmNwcAorKysgdGVzdC9TZW1hQ1hYL2N4
eC1jb25jZXB0LWRlY2xhcmF0aW9uLmNwcApAQCAtMjMsMyArMjMsNSBAQAog
dGVtcGxhdGU8dHlwZW5hbWUgVD4KIGNvbmNlcHQgYm9vbCBENjsgLy8gZXhw
ZWN0ZWQtZXJyb3Ige3t2YXJpYWJsZSBjb25jZXB0IGRlY2xhcmF0aW9uIG11
c3QgYmUgaW5pdGlhbGl6ZWR9fQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPgor
Y29uY2VwdCBib29sIEQ3KCkgdGhyb3coaW50KSB7IHJldHVybiB0cnVlOyB9
IC8vIGV4cGVjdGVkLWVycm9yIHt7ZnVuY3Rpb24gY29uY2VwdCBjYW4gbm90
IGhhdmUgZXhjZXB0aW9uIHNwZWNpZmllcnN9fQpJbmRleDogbGliL1NlbWEv
U2VtYVR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYi9T
ZW1hL1NlbWFUeXBlLmNwcAorKysgbGliL1NlbWEvU2VtYVR5cGUuY3BwCkBA
IC03MDAsNyArNzAwLDcgQEAKICAgICAgIC8qVm9sYXRpbGVRdWFsaWZpZXJM
b2M9Ki9Ob0xvYywKICAgICAgIC8qUmVzdHJpY3RRdWFsaWZpZXJMb2M9Ki9O
b0xvYywKICAgICAgIC8qTXV0YWJsZUxvYz0qL05vTG9jLCBFU1RfTm9uZSwK
LSAgICAgIC8qRVNwZWNMb2M9Ki9Ob0xvYywKKyAgICAgIC8qRVNwZWNSYW5n
ZT0qL1NvdXJjZVJhbmdlKCksCiAgICAgICAvKkV4Y2VwdGlvbnM9Ki9udWxs
cHRyLAogICAgICAgLypFeGNlcHRpb25SYW5nZXM9Ki9udWxscHRyLAogICAg
ICAgLypOdW1FeGNlcHRpb25zPSovMCwKQEAgLTM4MzMsNyArMzgzMyw3IEBA
CiAgICAgICAvLyBFeGNlcHRpb24gc3BlY3MgYXJlIG5vdCBhbGxvd2VkIGlu
IHR5cGVkZWZzLiBDb21wbGFpbiwgYnV0IGFkZCBpdAogICAgICAgLy8gYW55
d2F5LgogICAgICAgaWYgKElzVHlwZWRlZk5hbWUgJiYgRlRJLmdldEV4Y2Vw
dGlvblNwZWNUeXBlKCkpCi0gICAgICAgIFMuRGlhZyhGVEkuZ2V0RXhjZXB0
aW9uU3BlY0xvYygpLCBkaWFnOjplcnJfZXhjZXB0aW9uX3NwZWNfaW5fdHlw
ZWRlZikKKyAgICAgICAgUy5EaWFnKEZUSS5nZXRFeGNlcHRpb25TcGVjTG9j
QmVnKCksIGRpYWc6OmVycl9leGNlcHRpb25fc3BlY19pbl90eXBlZGVmKQog
ICAgICAgICAgIDw8IChELmdldENvbnRleHQoKSA9PSBEZWNsYXJhdG9yOjpB
bGlhc0RlY2xDb250ZXh0IHx8CiAgICAgICAgICAgICAgIEQuZ2V0Q29udGV4
dCgpID09IERlY2xhcmF0b3I6OkFsaWFzVGVtcGxhdGVDb250ZXh0KTsKIApJ
bmRleDogbGliL1NlbWEvU2VtYURlY2wuY3BwCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIGxpYi9TZW1hL1NlbWFEZWNsLmNwcAorKysgbGliL1NlbWEv
U2VtYURlY2wuY3BwCkBAIC03NDQ0LDYgKzc0NDQsMjEgQEAKICAgICAgICAg
TmV3RkQtPnNldEludmFsaWREZWNsKCk7CiAgICAgICB9CiAKKyAgICAgIGlm
IChjb25zdCBGdW5jdGlvblByb3RvVHlwZSAqRlBUID0gUi0+Z2V0QXM8RnVu
Y3Rpb25Qcm90b1R5cGU+KCkpIHsKKyAgICAgICAgaWYgKEZQVC0+aGFzRXhj
ZXB0aW9uU3BlYygpKSB7CisgICAgICAgICAgYXV0byBMb2NCZWcgPSBELmdl
dEZ1bmN0aW9uVHlwZUluZm8oKS5nZXRFeGNlcHRpb25TcGVjTG9jQmVnKCk7
CisgICAgICAgICAgYXV0byBMb2NFbmQgPSBELmdldEZ1bmN0aW9uVHlwZUlu
Zm8oKS5nZXRFeGNlcHRpb25TcGVjTG9jRW5kKCk7CisgICAgICAgICAgRGlh
ZyhMb2NCZWcsIGRpYWc6OmVycl9mdW5jdGlvbl9jb25jZXB0X2V4Y2VwdGlv
bl9zcGVjKQorICAgICAgICAgICAgPDwgRml4SXRIaW50OjpDcmVhdGVSZW1v
dmFsKFNvdXJjZVJhbmdlKExvY0JlZywgTG9jRW5kKSk7CisgICAgICAgICAg
TmV3RkQtPnNldEludmFsaWREZWNsKCk7CisgICAgICAgIH0KKyAgICAgICAg
ZWxzZSB7CisgICAgICAgICAgTmV3RkQtPnNldFR5cGUoQ29udGV4dC5nZXRG
dW5jdGlvblR5cGUoCisgICAgICAgICAgICBGUFQtPmdldFJldHVyblR5cGUo
KSwgRlBULT5nZXRQYXJhbVR5cGVzKCksCisgICAgICAgICAgICBGUFQtPmdl
dEV4dFByb3RvSW5mbygpLndpdGhFeGNlcHRpb25TcGVjKEVTVF9CYXNpY05v
ZXhjZXB0KSkpOworICAgICAgICB9CisgICAgICB9CisKICAgICAgIC8vIEMr
KyBDb25jZXB0cyBUUyBbZGNsLnNwZWMuY29uY2VwdF1wMjogRXZlcnkgY29u
Y2VwdCBkZWZpbml0aW9uIGlzCiAgICAgICAvLyBpbXBsaWNpdHkgZGVmaW5l
ZCB0byBiZSBhIGNvbnN0ZXhwciBkZWNsYXJhdGlvbiAoaW1wbGljaXRseSBp
bmxpbmUpCiAgICAgICBOZXdGRC0+c2V0SW1wbGljaXRseUlubGluZSgpOwpA
QCAtMTEwNzcsNyArMTEwOTIsNyBAQAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgLypSZXN0cmljdFF1YWxpZmllckxv
Yz0qL05vTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgLypNdXRhYmxlTG9jPSovTm9Mb2MsCiAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFU1RfTm9uZSwK
LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IC8qRVNwZWNMb2M9Ki9Ob0xvYywKKyAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIC8qRVNwZWNSYW5nZT0qL1NvdXJjZVJh
bmdlKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAvKkV4Y2VwdGlvbnM9Ki9udWxscHRyLAogICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLypFeGNlcHRpb25S
YW5nZXM9Ki9udWxscHRyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgLypOdW1FeGNlcHRpb25zPSovMCwKSW5kZXg6
IGxpYi9TZW1hL0RlY2xTcGVjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBsaWIvU2VtYS9EZWNsU3BlYy5jcHAKKysrIGxpYi9TZW1hL0RlY2xT
cGVjLmNwcApAQCAtMTc3LDcgKzE3Nyw3IEBACiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTb3VyY2VMb2NhdGlvbiBN
dXRhYmxlTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgRXhjZXB0aW9uU3BlY2lmaWNhdGlvblR5cGUKICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBF
U3BlY1R5cGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBTb3VyY2VMb2NhdGlvbiBFU3BlY0xvYywKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNvdXJjZVJh
bmdlIEVTcGVjUmFuZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICBQYXJzZWRUeXBlICpFeGNlcHRpb25zLAogICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU291
cmNlUmFuZ2UgKkV4Y2VwdGlvblJhbmdlcywKICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIE51bUV4Y2Vw
dGlvbnMsCkBAIC0yMTIsNyArMjEyLDggQEAKICAgSS5GdW4uUmVzdHJpY3RR
dWFsaWZpZXJMb2MgICAgPSBSZXN0cmljdFF1YWxpZmllckxvYy5nZXRSYXdF
bmNvZGluZygpOwogICBJLkZ1bi5NdXRhYmxlTG9jICAgICAgICAgICAgICA9
IE11dGFibGVMb2MuZ2V0UmF3RW5jb2RpbmcoKTsKICAgSS5GdW4uRXhjZXB0
aW9uU3BlY1R5cGUgICAgICAgPSBFU3BlY1R5cGU7Ci0gIEkuRnVuLkV4Y2Vw
dGlvblNwZWNMb2MgICAgICAgID0gRVNwZWNMb2MuZ2V0UmF3RW5jb2Rpbmco
KTsKKyAgSS5GdW4uRXhjZXB0aW9uU3BlY0xvY0JlZyAgICAgPSBFU3BlY1Jh
bmdlLmdldEJlZ2luKCkuZ2V0UmF3RW5jb2RpbmcoKTsKKyAgSS5GdW4uRXhj
ZXB0aW9uU3BlY0xvY0VuZCAgICAgPSBFU3BlY1JhbmdlLmdldEVuZCgpLmdl
dFJhd0VuY29kaW5nKCk7CiAgIEkuRnVuLk51bUV4Y2VwdGlvbnMgICAgICAg
ICAgID0gMDsKICAgSS5GdW4uRXhjZXB0aW9ucyAgICAgICAgICAgICAgPSBu
dWxscHRyOwogICBJLkZ1bi5Ob2V4Y2VwdEV4cHIgICAgICAgICAgICA9IG51
bGxwdHI7CkluZGV4OiBsaWIvUGFyc2UvUGFyc2VFeHByQ1hYLmNwcAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBsaWIvUGFyc2UvUGFyc2VFeHByQ1hY
LmNwcAorKysgbGliL1BhcnNlL1BhcnNlRXhwckNYWC5jcHAKQEAgLTExNDks
NyArMTE0OSw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgLypWb2xhdGlsZVF1YWxpZmllckxvYz0qL05vTG9jLAog
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8q
UmVzdHJpY3RRdWFsaWZpZXJMb2M9Ki9Ob0xvYywKICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNdXRhYmxlTG9jLAotICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVTcGVj
VHlwZSwgRVNwZWNSYW5nZS5nZXRCZWdpbigpLAorICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVTcGVjVHlwZSwgRVNwZWNS
YW5nZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBEeW5hbWljRXhjZXB0aW9ucy5kYXRhKCksCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRHluYW1pY0V4Y2VwdGlv
blJhbmdlcy5kYXRhKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgRHluYW1pY0V4Y2VwdGlvbnMuc2l6ZSgpLApAQCAt
MTIxNyw3ICsxMjE3LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgLypSZXN0cmljdFF1YWxpZmllckxvYz0q
L05vTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBNdXRhYmxlTG9jLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICBFU1RfTm9uZSwKLSAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLypFU3Bl
Y0xvYz0qL05vTG9jLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAvKkVTcGVjUmFuZ2U9Ki9Tb3VyY2VSYW5nZSgp
LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAvKkV4Y2VwdGlvbnM9Ki9udWxscHRyLAogICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKkV4Y2VwdGlvblJh
bmdlcz0qL251bGxwdHIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIC8qTnVtRXhjZXB0aW9ucz0qLzAsCkluZGV4
OiBsaWIvUGFyc2UvUGFyc2VFeHByLmNwcAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ci0tLSBsaWIvUGFyc2UvUGFyc2VFeHByLmNwcAorKysgbGliL1BhcnNl
L1BhcnNlRXhwci5jcHAKQEAgLTI3NDcsNyArMjc0Nyw3IEBACiAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKlJlc3Ry
aWN0UXVhbGlmaWVyTG9jPSovTm9Mb2MsCiAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAvKk11dGFibGVMb2M9Ki9Ob0xv
YywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIEVTVF9Ob25lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgLypFU3BlY0xvYz0qL05vTG9jLAorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLypFU3BlY1Jh
bmdlPSovU291cmNlUmFuZ2UoKSwKICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIC8qRXhjZXB0aW9ucz0qL251bGxwdHIs
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAvKkV4Y2VwdGlvblJhbmdlcz0qL251bGxwdHIsCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKk51bUV4Y2VwdGlv
bnM9Ki8wLApJbmRleDogbGliL1BhcnNlL1BhcnNlRGVjbC5jcHAKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gbGliL1BhcnNlL1BhcnNlRGVjbC5jcHAK
KysrIGxpYi9QYXJzZS9QYXJzZURlY2wuY3BwCkBAIC01NjEyLDcgKzU2MTIs
NyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgVm9sYXRpbGVRdWFsaWZpZXJMb2MsCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBSZXN0cmljdFF1YWxpZmll
ckxvYywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIC8qTXV0YWJsZUxvYz0qL1NvdXJjZUxvY2F0aW9uKCksCi0gICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFU3Bl
Y1R5cGUsIEVTcGVjUmFuZ2UuZ2V0QmVnaW4oKSwKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVTcGVjVHlwZSwgRVNw
ZWNSYW5nZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIER5bmFtaWNFeGNlcHRpb25zLmRhdGEoKSwKICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIER5bmFtaWNF
eGNlcHRpb25SYW5nZXMuZGF0YSgpLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgRHluYW1pY0V4Y2VwdGlvbnMuc2l6
ZSgpLApJbmRleDogaW5jbHVkZS9jbGFuZy9TZW1hL0RlY2xTcGVjLmgKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gaW5jbHVkZS9jbGFuZy9TZW1hL0Rl
Y2xTcGVjLmgKKysrIGluY2x1ZGUvY2xhbmcvU2VtYS9EZWNsU3BlYy5oCkBA
IC0xMjU1LDggKzEyNTUsMTIgQEAKICAgICAvLy8gYW55LgogICAgIHVuc2ln
bmVkIE11dGFibGVMb2M7CiAKLSAgICAvLy8gXGJyaWVmIFRoZSBsb2NhdGlv
biBvZiB0aGUga2V5d29yZCBpbnRyb2R1Y2luZyB0aGUgc3BlYywgaWYgYW55
LgotICAgIHVuc2lnbmVkIEV4Y2VwdGlvblNwZWNMb2M7CisgICAgLy8vIFxi
cmllZiBUaGUgYmVnaW5uaW5nIGxvY2F0aW9uIG9mIHRoZSBrZXl3b3JkIGlu
dHJvZHVjaW5nIHRoZSBzcGVjLCBpZgorICAgIC8vLyBhbnkuCisgICAgdW5z
aWduZWQgRXhjZXB0aW9uU3BlY0xvY0JlZzsKKworICAgIC8vLyBcYnJpZWYg
VGhlIGVuZCBsb2NhdGlvbiBvZiB0aGUga2V5d29yZCBpbnRyb2R1Y2luZyB0
aGUgc3BlYywgaWYgYW55LgorICAgIHVuc2lnbmVkIEV4Y2VwdGlvblNwZWNM
b2NFbmQ7CiAKICAgICAvLy8gUGFyYW1zIC0gVGhpcyBpcyBhIHBvaW50ZXIg
dG8gYSBuZXdbXSdkIGFycmF5IG9mIFBhcmFtSW5mbyBvYmplY3RzIHRoYXQK
ICAgICAvLy8gZGVzY3JpYmUgdGhlIHBhcmFtZXRlcnMgc3BlY2lmaWVkIGJ5
IHRoaXMgZnVuY3Rpb24gZGVjbGFyYXRvci4gIG51bGwgaWYKQEAgLTEzMjMs
OCArMTMyNywxMiBAQAogICAgICAgcmV0dXJuIFNvdXJjZUxvY2F0aW9uOjpn
ZXRGcm9tUmF3RW5jb2RpbmcoUlBhcmVuTG9jKTsKICAgICB9CiAKLSAgICBT
b3VyY2VMb2NhdGlvbiBnZXRFeGNlcHRpb25TcGVjTG9jKCkgY29uc3Qgewot
ICAgICAgcmV0dXJuIFNvdXJjZUxvY2F0aW9uOjpnZXRGcm9tUmF3RW5jb2Rp
bmcoRXhjZXB0aW9uU3BlY0xvYyk7CisgICAgU291cmNlTG9jYXRpb24gZ2V0
RXhjZXB0aW9uU3BlY0xvY0JlZygpIGNvbnN0IHsKKyAgICAgIHJldHVybiBT
b3VyY2VMb2NhdGlvbjo6Z2V0RnJvbVJhd0VuY29kaW5nKEV4Y2VwdGlvblNw
ZWNMb2NCZWcpOworICAgIH0KKworICAgIFNvdXJjZUxvY2F0aW9uIGdldEV4
Y2VwdGlvblNwZWNMb2NFbmQoKSBjb25zdCB7CisgICAgICByZXR1cm4gU291
cmNlTG9jYXRpb246OmdldEZyb21SYXdFbmNvZGluZyhFeGNlcHRpb25TcGVj
TG9jRW5kKTsKICAgICB9CiAKICAgICAvLy8gXGJyaWVmIFJldHJpZXZlIHRo
ZSBsb2NhdGlvbiBvZiB0aGUgcmVmLXF1YWxpZmllciwgaWYgYW55LgpAQCAt
MTQ5Niw3ICsxNTA0LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBTb3VyY2VMb2NhdGlvbiBSZXN0cmljdFF1YWxpZmllckxv
YywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTb3Vy
Y2VMb2NhdGlvbiBNdXRhYmxlTG9jLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIEV4Y2VwdGlvblNwZWNpZmljYXRpb25UeXBlIEVT
cGVjVHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBTb3VyY2VMb2NhdGlvbiBFU3BlY0xvYywKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBTb3VyY2VSYW5nZSBFU3BlY1JhbmdlLAog
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBhcnNlZFR5
cGUgKkV4Y2VwdGlvbnMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgU291cmNlUmFuZ2UgKkV4Y2VwdGlvblJhbmdlcywKICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBOdW1F
eGNlcHRpb25zLApJbmRleDogaW5jbHVkZS9jbGFuZy9CYXNpYy9EaWFnbm9z
dGljU2VtYUtpbmRzLnRkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGlu
Y2x1ZGUvY2xhbmcvQmFzaWMvRGlhZ25vc3RpY1NlbWFLaW5kcy50ZAorKysg
aW5jbHVkZS9jbGFuZy9CYXNpYy9EaWFnbm9zdGljU2VtYUtpbmRzLnRkCkBA
IC0xOTczLDYgKzE5NzMsOCBAQAogICAiZnVuY3Rpb24gY29uY2VwdCBkZWNs
YXJhdGlvbiBtdXN0IGJlIGEgZGVmaW5pdGlvbiI+OwogZGVmIGVycl92YXJf
Y29uY2VwdF9ub3RfaW5pdGlhbGl6ZWQgOiBFcnJvcjwKICAgInZhcmlhYmxl
IGNvbmNlcHQgZGVjbGFyYXRpb24gbXVzdCBiZSBpbml0aWFsaXplZCI+Owor
ZGVmICBlcnJfZnVuY3Rpb25fY29uY2VwdF9leGNlcHRpb25fc3BlYyA6IEVy
cm9yPAorICAiZnVuY3Rpb24gY29uY2VwdCBjYW4gbm90IGhhdmUgZXhjZXB0
aW9uIHNwZWNpZmllcnMiPjsKIAogLy8gQysrMTEgY2hhcjE2X3QvY2hhcjMy
X3QKIGRlZiB3YXJuX2N4eDk4X2NvbXBhdF91bmljb2RlX3R5cGUgOiBXYXJu
aW5nPAo=

--b1_5ecbcf65bbc234960a3f439bd101ee5d
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KY2ZlLWNvbW1p
dHMgbWFpbGluZyBsaXN0CmNmZS1jb21taXRzQGxpc3RzLmxsdm0ub3JnCmh0dHA6Ly9saXN0cy5s
bHZtLm9yZy9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vY2ZlLWNvbW1pdHMK

--b1_5ecbcf65bbc234960a3f439bd101ee5d--